added grunt task for development
added some css (working on)
added some css
merge and fix conflicts