init
Merge branch 'master' of https://github.com/enixdark/Angularjs-practices

Conflicts:
	.gitignore