okjohn
Merge branch 'master' of https://github.com/NicklasSlagbrand/AtoM.git

Conflicts:
	src/se/mah/k3/slagbrand/nicklas/DjurGameWindow.java
med splashscreen