won't let me pull unless i commit
Merge branch 'master' of https://github.com/gnapo/HamSanApp

Conflicts:
	src/hamSanApp/Sandwich.java
I hope i killed all conflicts