committing so i can pull...
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-

Conflicts:
	GroupBuy/app/views/purchases/show.html.erb
changed invited_group to group in purchases
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-