Remove stupid shit, add awesome shit
Merge branch 'master' of https://github.com/dshields1/PartyGenius

Conflicts:
	.DS_Store