things n stuff
Merge branch 'master' of github.com:rozap/vulnpub

Conflicts:
	priv/static/js/app.js