this is a commit
Merge remote-tracking branch 'upstream/master'
new merge
more documenting
did some getters that were forgotten
fixed some getters
Merge pull request #14 from b-dub25/master

getters