refactor
Merge branch 'master' of https://github.com/tgdwyer/WebCola.git