Hapi + halacious dependencies
Merge branch 'master' of https://github.com/McOmghall/comp-pool.git

Conflicts:
	package.json