Commit changes to avoid conflict, jgmulvad
Merge branch 'master' of https://github.com/Shiphter/WebTekProject

Conflicts:
	Handin3/work/web/tek/icouldntcareless/musicshop/beans/Item.java