Older commit from uni machine
Merged changes

Merge branch 'master' of https://github.com/jejoenje/SWTBAT1314

Conflicts:
	04-Bat analysis.R