bootstrap generated shite for user and application erbs
Merge branch 'master' of github.com:stripstarter/stripstarter

Conflicts:
	app/views/users/_form.html.erb
	app/views/users/show.html.erb