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

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

pulling gretchen's
Merge pull request #1323 from gretchenmcc/master

Roughed out "people" section, plus minor edits
integrating dropbox refs with the whitepaper content
fixes #1324 rough draft of eopas phrase export which can be converted to xml
added more details about EOPAS its a shame we didnt find out about it earlier...

and some other references for other plugins we would like to use if a resource comes up that would benefit from them
Merge pull request #1325 from cesine/master

EOPAS references and rough draft of export
Merge pull request #1326 from hisakonog/master

editing caml paper
adding some more notes about other computational linguistics plugins that coudl be integrated if a project needed them
breaking lines to reduce potential conflicts on paragraphs as we proofread
editing
adding more quotes
reverting 5911650e80680f1445b55111b958b582f1786ed6 on the design section to be able to merge in hisakonog's change with out losing any references
taking hisakos changes for the design section
putting back in wittenburg citation
enumerate was not matching a description, made it a description to make it build
Merge pull request #4 from OpenSourceFieldlinguistics/master

Changes from upstream so you can work on the CAML paper...
pdf