Merge branch 'master' of https://github.com/RamonValk/GritCollege

Conflicts:
	index.html
123