Server stuff
Merge branch 'master' of github.com:iwilliams/Pocket-Change