remove grunt stuff
remove css folder for application.css
Merge branch 'master' of github.com:CASFEE2014Team9/RedditClone

Conflicts:
	gulpfile.js
fix merge conflicts