migration for user adding first name and last name
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
omniauth gem