BOOM Rewrite
Merge branch 'master' of https://github.com/scampb3ll/MemVault

Conflicts:
	memtag-data/pom.xml