Merge branch 'master' of github.com:tolien/ledgr-app