YET STILL MOAR FORMATTING
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-

Conflicts:
	GroupBuy/app/views/purchases/edit_payment.html.erb