being dumb and trying to fix string problems
Merge branch 'master' of https://github.com/rsyvarth/PebblePresenter-PebbleApp