styling with bootstrap
Merge branch 'master' of https://github.com/wafflestudio/cumulus

Conflicts:
	rails_app/app/assets/javascripts/explorer.js.coffee
	rails_app/app/assets/javascripts/main.js.coffee