need to start putting int settings
Merge branch 'master' of https://github.com/Sybrand/digital-panda