Merge branch 'master' into feature/3

This is because the version of buildPkg.R in this branch was outdated
when it was created

buildPkg.R

@@ -32,8 +32,8 @@ packageVersion("legTools")
 
 ## Build the package (it will be one directory up)
 build(manual = TRUE, vignettes = FALSE)
-# build the binary version for windows
-build_win()
+# build the binary version for windows (not used)
+# build_win()
 
 ## Test install with install.packages
 pkg <- paste0("../legTools_", packageVersion("legTools"), ".tar.gz")