Merge branch 'master' of https://github.com/aestears/plantTracker

# Conflicts:
#	vignettes/Suggested_plantTracker_Workflow.Rmd

Update assign.R

trying to fix the issue with dormancy-- if multiple years of 'previous data' are empty

Update assign.R

updated the centroid-distance tiebreaker in the clonal==FALSE trackID assignment (what if there are two smallest values in the 'dists' d.f, but there are different parents?

Update assign.R

fixed a silly issue with adding basalArea_genet to missed-year/post-dorm data

Update checkDat.R

actually doing what the previous commit meant to