added amendments from Jan/Feb meetings
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/gh-pages'