Fixing more merge problems
removed double calls to ng-view
Merge pull request #3 from funvill/master

Fixed the problems with the merge.