updated css
Merge branch 'dev' of https://github.com/skeep/DiscoveryTemp into dev

Did a git pull
updated set of changes