Merge branch 'master' of C:\Users\Chris\Desktop\HometownOdyssey with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ca/bcit/hometown/hometownodyssey/Store.java
Completed the Store screen.