'Merge"
Merge branch 'master' into gh-pages

Conflicts:
	opengl-project.html
	unitrans-data-vis.html
'Work'
Merge branch 'gh-pages' of https://github.com/trishafuntanilla/mygithubpage into gh-pages
Deleted unnecessary stuff...