pito's merge attempt
I fixed this merge today!
Merge branch 'master' of github.com:pitosalas/teamdemo