something
Fixed what fre didnt want to do
Merge remote-tracking branch 'origin/master'

Conflicts:
	Java Project/GeneralStore/build/classes/generalstore/GeneralStore.class
	Java Project/GeneralStore/src/generalstore/GeneralStore.java
something
something