add angular test set up
Merge branch 'master' of github.com:yeehaa123/coding-the-skeleton

Conflicts:
	gulpfile.js
	src/app/app.js