Fix git stuff now
Merge branch 'master' of https://github.com/artiespeedy/DNA-RNAAnimation

Conflicts:
	scripts/start.js