Deletes desktop.css and combines it with main file
Merge pull request #17 from joshjeong/responsive

Deletes desktop.css and combines it with main file