ignore
Merge branch 'step-7' of github.com:jalehman/omtut-angular into step-7

Conflicts:
	.gitignore
good to go
architecture change, docs