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

Conflicts:
	Gemfile

			hello#
update
social buttons
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