fixed users#show route and updated user show method
Fixed merge conflict
Logo leads to homepage
Updated signin and signup view with bootstrap
devise view edit
New custom css
Fixed homepage index link
More dots! for our carousel
updates/consolidates migrations
merge master
updates/adds models
Fixed the button links on the index
Fixed location of buttons and copy on front page carousel
fixes relationships on event model
Merge branch 'master' of github.com:Harveynglish/freespace
add fixes to ihaveaspace and add form to ineedaspace
Merge branch 'master' into addinghtml

Conflicts:
	app/views/activities/new.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/index.html.erb
	app/views/spaces/new.html.erb