Using mocha-phantomjs for tests
Merge branch 'master' of github.com:annem/JediTraining
Added test runner to watch task
Merge branch 'master' of github.com:annem/JediTraining

Conflicts:
	test/index.html