fb data on poem wall
Added FriendlyId (slugs) to User
Merge remote-tracking branch 'upstream/master'

Added FriendlyId to Users
merging woes
Merge pull request #38 from pedrogrande/master

Added FriendlyID to Users
Fixed footer and other GUI tweaks
Merge branch 'master' of github.com:sherwyngoh/codetry into sherwyngoh-master

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge pull request #40 from Bazay/master

Fixed footer, other GUI tweaks and added a favicon
Merge remote-tracking branch 'upstream/master'
add headings/icons