merge?
Merge branch 'master' of https://github.com/Pancia/hackathon

Conflicts:
	src/main/java/com/pancia/hackathon/MainActivity.java