Merge pull request #2 from kaitlin-farr/master

Initial pull
Added my 3 files
Updated to the c# version (actually works) - still no gui
Merge pull request #3 from tvkwoodlands/subBranch

Sub branch
Merge pull request #8 from tvkwoodlands/master

Thomas-first update test
Merge pull request #1 from kaitlin-farr/master

testing projects in netbeans