feed
Merge branch 'master' of https://github.com/cassioesp/SneakPic

Conflicts:
	src/gui/MainActivity.java