Commit ecc68ab1bd71437397a6224fac772131d4c263ca

  • Tree SHA1: bc84691
  • Parent SHA1: 09639a7 (Add README file)
  • Parent SHA1: 04640f7 (Moving the website to Flask) 
Merge branch 'master' of https://github.com/janastu/mural-annotation

Resolve Conflicts:
	myVector.js
	templates/index.html