first round of revisions
Merge branch 'master' of github.com:StevenClontz/Research