um...what did i do????
Merge branch 'master' of https://github.com/darkzin/splant
 edit css syntax error