test commit
Merge branch 'sandbox' of https://github.com/Jacksai/BoTaC into welcome

Conflicts:
	app/views/welcome/index.html.erb
Bootstrap