adds new code
removes code
Merge branch 'gh-pages' of https://github.com/fschram/ngtraining into gh-pages

Conflicts:
	index.html