Fix symbolic link issues
Merge branch 'master' of https://github.com/csci2160/3ddemo

Conflicts:
	index.html