consolidate css files
Merge pull request #185 from Align/matt-dev

consolidate css files