initial revision
Merge branch 'master' of github.com:eucuepo/AngularKii

Conflicts:
	.gitignore