Worked on stuff!

lololololol
Merge remote-tracking branch 'origin/master'

Conflicts:
	Burger.java
	HoagieType.java