Merge branch 'master' of https://github.com/chiragshenoy/RepoConf

Conflicts:
	app/src/main/java/conference/example/chirag/conference/MainActivity.java