spritz
Merge remote-tracking branch 'origin/master' into Dorota

Conflicts:
	.idea/modules.xml
	app/src/main/java/com/fbhack/newsflash/MainActivity.java
	app/src/main/res/layout/activity_main.xml
spritz working and merged
Spritz working and merged
Merge branch 'master' of https://github.com/roinir237/news_flash