Refaktorointia ja kaikkee kivaa
Merge branch 'master' of https://github.com/liiza/DMP13

Conflicts:
	gen/com/game/alias/R.java
	res/layout/activity_game.xml
	res/values/strings.xml
	src/connection/ConnectorImpl.java