asdf
Merge branch 'master' of https://github.com/austinscchiang/now

Conflicts:
	app/src/main/java/com/ac/austin/now/MainActivity.java