merged... things together
Merge branch 'master' of https://github.com/29jm/Chloggr

merged.. again...
added missing png from tracker