Item Grouping
Merge branch 'master' of https://github.com/HackCharleston/Zubielicious

Conflicts:
	zubieliciousApp/www/css/style.css