Initialised
Merge branch 'master' of https://github.com/suprahfly/ang-tut

Conflicts:
	.gitignore