Added bootstrap files
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app

Conflicts:
	app/views/homes/index.html.erb
	app/views/index.html.erb

Fixed conflicts