Merge pull request #33 from JustinSGray/scitech

Scitech
fixed merge
justin changes abstract
jeff changes
got rid of most of the "proposed"
Merge pull request #31 from jcchin/scitech

Scitech