inget

inget
Merge branch 'master' of https://github.com/NicklasSlagbrand/DesignProjekt

Conflicts:
	bin/DesignProjekt.apk
	bin/classes.dex
	bin/classes/se/mah/k3/slagbrand/nicklas/DjurGameWindow.class
	bin/classes/se/mah/k3/slagbrand/nicklas/ProvArrayClass.class
	src/se/mah/k3/slagbrand/nicklas/ProvArrayClass.java