merged index code
changed syntax for ng-view
Merge branch 'master' of https://github.com/tmlayton/globalhack