Continued with tests
Merge branch 'master' of https://github.com/tomd-chalmers/rojarna-chalmers

Conflicts:
	ProjektRojarna/save/classicSave.sav
Merge branch 'master' of https://github.com/tomd-chalmers/rojarna-chalmers

Conflicts:
	ProjektRojarna/save/classicSave.sav