+Bootstrap & +Test commit and push to heroku
Merge branch 'master' of heroku.com:tranquil-taiga-1581

Conflicts:
	views/index.erb
Test