- add testing framework and make it run using cake
Merge branch 'master' of github.com:ritzalam/exploringHapi

Conflicts:
	package.json