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

Conflicts:

	ProjektRojarna/src/main/java/com/rojarna/projektrojarna/ClassicModel.java