adds bourbon, styling changes, profile view
bourbon styling
so many changes
Merge remote-tracking branch 'origin/master' into Bourbon_Styling

Conflicts:
	.DS_Store
	Gemfile.lock
	app/.DS_Store
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/dashboard.css
	app/assets/stylesheets/dashboard.css.scss
	app/assets/stylesheets/main.css.scss
	app/controllers/dashboard_controller.rb
	app/controllers/events_controller.rb
	app/models/user.rb
	app/views/dashboard/index.html.erb
	app/views/layouts/application.html.erb
removes old web socket info from events controller
fixed merge conflicts with master