Sanaojen haku tekstifiluista
Merge branch 'master' of https://github.com/liiza/DMP13

Conflicts:
	src/com/game/alias/MainActivity.java