new updates
updates again
Merge branch 'ShaneBranch'

Merge CSS File
fix merge error on JS file
Delete DS file