server update
parse
Merge branch 'master' of https://github.com/aaronsdevera/project-tapvault

Conflicts:
	parsemessage.js