mvp-ing
Merge branch 'master' of github.com:Spontraineous/Spontraineous

Conflicts:
	app/views/users/_form.html.erb
commit gemfile lock