big changes
Merge branch 'master' into gh-pages

Conflicts:
	about.html
	contact.html
	css/bootstrap-theme.css
	index.html
	js/bootstrap.min.js
	js/jquery.js
mergep2