Merge branch 'master' of heroku.com:guarded-inlet-7342

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
New Commit
Merge branch 'master' of heroku.com:guarded-inlet-7342
Add new bootstrap tamplate - Jumbotron