change fields
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-

Conflicts:
	GroupBuy/app/views/purchases/_form.html.erb
erge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-
purchases description field
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-

Conflicts:
	GroupBuy/app/models/purchase.rb