Raakaversio yhteyteen
Merge branch 'master' of https://github.com/liiza/DMP13

Conflicts:
	gen/com/game/alias/R.java
	res/values/strings.xml
	src/com/game/alias/MainActivity.java
Merge conflicti virhe