dev
Merge branch 'master' of https://github.com/gurre/LET375-lab1

Conflicts:
	AngloTrainer.java