Changes
Merge branch 'refs/heads/pre3dvideo'

Conflicts:
	index.html
	js/app.js
Create README.md
Update README.md
Update README.md
Fixed an issue with safari
Merge branch 'master' of https://github.com/jheising/2019