2

2
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/R$id.class
	bin/resources.ap_
	gen/se/mah/k3/slagbrand/nicklas/R.java