init
Merge branch 'master' of https://github.com/JaisEdelmann/simple-angularjs