Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

merging gina's section
editig
Merge branch 'master' of github.com:OpenSourceFieldlinguistics/FieldDB

pulling gretchen's
editing
taking hisakos changes for the design section
putting back in wittenburg citation