testing
fixed merge
rendering as json
Merge pull request #13 from slwaller/master

rendering as json
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
messing with routes and angular
Merge pull request #14 from ansleyjones/master

messed with routes...
injector module issue
Merge pull request #15 from ansleyjones/master

injector module issue
merge fix