adding watch for templates
Merge pull request #3 from cmlorenz/master

removing .idea files and adding content to home template
fixing the scroll bar showing up during ng-view transitions
Merge remote-tracking branch 'origin/master'
Merge pull request #1 from calebthebrewer/master

head merge