Committing the changes
Committing the Name
Merge branch 'master' of https://github.com/floyd/bigdatasciencehub

Conflicts:
	app/assets/stylesheets/framework_and_overrides.css.scss