Cleaned up the project
Fix merge

Merge branch 'master' of https://github.com/SESman/anam2

Conflicts:
	1_build_data.r