Merge pull request #12 from Mathdrquinn/master

Liz's commits
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