merchant fix, add phantom to package list, route fix
Merge branch 'master' of https://github.com/trevoranderson/Intel-PWNED

Conflicts:
	pwnedapp/pwnedapp/routes/routes.js