Merge branch 'master' of github.com:climbingcode/bam- into development

Conflicts:
	db/schema.rb
add brands to users
add brands to users
added signin to navbar
:wq

:q

Merge branch 'development' of github.com:climbingcode/bam- into development

Conflicts:
	app/assets/stylesheets/main.scss
	app/views/index.html.erb
	db/schema.rb
routes
Updating paths for asset form.