merge
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
many script errors reordered angualr files into the assest pipeline and fixed css reference errors
Merge pull request #13 from Mathdrquinn/master

I'm the best, with 18 errors