Main Activity
Merge branch 'develop' of github.com:f2prateek/IFTTW into develop

Conflicts:
	app/src/main/java/com/ifttw/ui/MainActivity.java