Init.
Merge branch 'master' of https://github.com/korkota/angular-template

Conflicts:
	.gitignore