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

Conflicts:
	Gemfile

			hello#
update
update
social buttons
add javascript to poem wall
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
Merge branch 'master' of github.com:teebii/codetry into teebii-master

Conflicts:
	app/views/comments/_comment.html.erb
	app/views/comments/create.js.erb
	app/views/poems/show.html.erb
	app/views/poems_wall/index.html.erb
	db/schema.rb
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:JurgensSmit/codetry into JurgensSmit-master

Conflicts:
	db/schema.rb