Merge pull request #19 from addisonbgross/shBranch

Started the Decoder. Can't get strings to be evaluated yet
Fixed the last issue that I forgot about in my previous commit