update jan 11
a
reset

Merge branch 'master' of https://github.com/bw4sz/Maquipicuna

Conflicts:
	GPSMatching.R
	HummingbirdTransect.R
	Network.R
	names.txt