Merge branch 'master' of https://github.com/avoorhis/vamps-node.js

Conflicts:
	views/index.html