Uncommitted changes from last year
Merge branch 'master' of github.com:jheidel/android-ski-app