Merge pull request #1 from Bazay/master

Added basic user profile
tutorial
Merge remote-tracking branch 'upstream/master' into tutorial

Conflicts:
	db/schema.rb
Merge pull request #2 from shal23/tutorial

Tutorial
add tutorial to seeds.rb
update nav and routes
add teams, memberships; allow users to join teams
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/tutorials_controller.rb
	app/views/tutorials/_form.html.erb
	config/routes.rb
	db/schema.rb