facebook login working correctly
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-

Conflicts:
	GroupBuy/app/views/users/show.html.erb
Merge branch 'master' of https://github.com/harry-sanabria/hackPrinceton2013TeamGDT-