messed up
Merge branch 'master' of https://github.com/kaidombrowski/Packtrack

Conflicts:
	js/custom.js
	resources/templates/home.php