messing with angular
fixed merge issue
trying to fix angular
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
fixed angular routing issue
Merge pull request #17 from natalie03/master

fixed issue