second fix
Merge branch 'gh-pages' of https://github.com/Frondor/gta-bootstrap into gh-pages

Conflicts:
	index.html