init
init
Merge branch 'master' of github.com:rezzor/testi-angularjs

Conflicts:
	README.md