fixing merge issues
Merge branch 'master' of https://github.com/thomaswicker/potion-css