fb data on poem wall
merging woes
Merge branch 'master' of github.com:sherwyngoh/codetry into sherwyngoh-master

Conflicts:
	app/models/user.rb
	db/schema.rb