made all major changes
Merge branch 'dev'

Conflicts:
	css/bootstrap.css
	css/bootstrap.min.css
	index.html
	js/bootstrap.js
	js/bootstrap.min.js