various angular fiddlings
Merge branch 'master' of https://github.com/chrishawkinsnz/E-Learning.git

Conflicts:
	E-Learning/WebContent/index4.html
Merge branch 'master' of
https://github.com/chrishawkinsnz/E-Learning.git

Conflicts:
	E-Learning/WebContent/index4.html