applied css changes to .less and recompiled
resolving conflicts
Merge pull request #63 from objcow/master

Mark's Initial commit to repository