Merge pull request #14 from ansleyjones/master

messed with routes...
messing with angular
fixed merge issue
Merge pull request #15 from ansleyjones/master

injector module issue
trying to fix angular
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
:QW
:wq
:quit

b
merge fix
Merge pull request #16 from jvh1979theironyard/master

Got that technique crud done
fixed angular routing issue
Merge pull request #17 from natalie03/master

fixed issue
fixed GET error