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