commit
commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile

			hello#
update
update
fb data on poem wall
merging woes
Merge pull request #38 from pedrogrande/master

Added FriendlyID to Users
Fixed footer and other GUI tweaks
social buttons
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
remove faq link from navigation bar
add javascript to poem wall
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:shal23/codetry into shal23-master

Conflicts:
	app/models/user.rb
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb
	db/schema.rb
fix like button positioning
Merge branch 'master' of github.com:davidjsevans/codetry

Conflicts:
	app/views/layouts/_footer.html.erb
Merge pull request #42 from JurgensSmit/master

remove faq link
add headings/icons