more stuff
Merge branch 'master' of https://github.com/jcstrandburg/virtour.git