Comments and removed destructor that are not needed
Fixing Conflicts
Fixed conflicts and comments
Merge pull request #25 from HallCat/KillianBranch

Comments and removal of Destructors