main activity improvements
Merge branch 'master' of https://github.com/geraltikus/Word-cards

Conflicts:
	src/com/example/androidwords/MainActivity.java