merge changes
Merge branch 'master' of https://github.com/grbritz/distrack-website

Conflicts:
	bootstrap/dist/img/max.jpg
	index.html