updated with some new info
Merge branch 'master' of github.com:trestles/f2
types of commits