no message
Merge branch 'master' of https://github.com/ehis/SmartShop

Conflicts:
	smartShop.iml
	src/main/java/com/mobile/smartshop/MainActivity.java
ended up deleting some characters that appeared and disrupted build.  <<<<<<< HEAD  ========  >>>>>>>>  And some random characters
no message
integrated with develop branch
removed MainActivity
removed anonymous setup on parse login
Merge branch 'master' into develop

preparing master for merge/flush with develop branch
Merge remote-tracking branch 'origin/develop' into develop