made some tweaks, worked forever trying to get the merge to work, failed.
Merge branch 'master' of https://github.com/bobboau/project2.git