Merge pull request #27 from Ricky1833/master

adding changes made to .cc and .h
Merge pull request #8 from IanJRigg/master

getting Riggins updates
adding updates
Merge pull request #28 from candaya/master

merging additions to .cc
practice parsing file
adding modifications
Ian's algo
Merge pull request #29 from candaya/master

practice parse file
Merge pull request #4 from IanJRigg/master

merging new commits