changes here
Merge branch 'master' of github.com:trestles/alijosapp