brought back bootstrap, cleaned up templates and and css significantly, almost all styles added were near duplicates of bootstrap
hella changes
.
Merge branch 'feature/templates' of https://github.com/joeblackwaslike/portal into joeblackwaslike-feature/templates
never again.
Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/autoscale.js
	app/assets/stylesheets/common/layout.sass
	app/assets/stylesheets/common/main.sass
	app/assets/stylesheets/common/splash.sass
	app/controllers/application_controller.rb
	app/controllers/members_controller.rb
	app/controllers/pages_controller.rb
	app/helpers/application_helper.rb
	app/helpers/enter_new_earth_helper.rb
	app/helpers/exchange_helper.rb
	app/views/home/index.haml
	app/views/layouts/_footer.haml
	app/views/layouts/_header.haml
	app/views/layouts/_top_menu.haml
	app/views/layouts/application.haml
	app/views/layouts/sections.haml
	app/views/layouts/splash.haml
	app/views/pages/exchange.haml
	app/views/pages/index.haml
	app/views/pages/institute.haml
	config/routes.rb