Merge branch 'master' of https://github.com/jjc3737/Vektor

Conflicts:
	index.html
fix merge conflict!
merge