Argh this is some crap
Merge branch 'master' of https://github.com/xonefivd/S13GroupA

Conflicts:
	src/newTestClass.java