save current work
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/java/com/mobile/smartshop/ShopActivity.java
changes iml file to consensu
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop
Merge remote-tracking branch 'origin/develop' into develop
save current work
--Changed the logig proceedure to store users credentials on the local disk when they sign up or sign in
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/java/com/mobile/smartshop/MainActivity.java
	src/main/java/com/mobile/smartshop/SignInActivity.java
	src/main/java/com/mobile/smartshop/SignUpActivity.java
	src/main/java/com/mobile/smartshop/User.java
-- re-added some changes to fix the merge
-- db changes
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	smartShop.iml
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/com/mobile/smartshop/MainActivity.java
	src/main/res/layout/activity_main.xml
changed sign in
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/java/com/mobile/smartshop/SignInActivity.java
	src/main/java/com/mobile/smartshop/User.java
added a new thing to db
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/java/com/mobile/smartshop/MainActivity.java
	src/main/java/com/mobile/smartshop/SignInActivity.java
	src/main/java/com/mobile/smartshop/SignUpActivity.java
Merge remote-tracking branch 'origin/develop' into develop
Removed MainActivity
integrating list view in shopActiivity