android updates
gygjh
Merge branch 'master' of https://github.com/Bauxcai/Shopping-App

Conflicts:
	.idea/gradle.xml
	gradle/wrapper/gradle-wrapper.properties
mkkl
Merge branch 'master' of https://github.com/Bauxcai/Shopping-App

Conflicts:
	app/src/main/java/com/example/ben/shoppinghelper/ActivityLIST.java
before merge ith major changes
Merge branch 'master' of https://github.com/Bauxcai/Shopping-App

Conflicts:
	app/src/main/java/com/example/ben/shoppinghelper/ActivityLIST.java
	gradle/wrapper/gradle-wrapper.properties
Merge branch 'master' of https://github.com/Bauxcai/Shopping-App
Insertion Sort