Pre merge.
Fixed merge errors.
Fixed read in
fixed the same merge conflicts
Merge pull request #10 from brain-murphy/connorbranch

Connorbranch