Fixed broken tests and directory structure
Merge branch 'master' of https://github.com/NVISIA/AngularWorkshop

Conflicts:
	presentation/index.html
Updates to presentation