correctly referenced this
Merge branch 'master' of https://github.com/AlexNava/alexnava.github.io

Conflicts:
	js/GlStuff.js