Started readme
Merge remote branch 'josh/master'
Fixed Horrible Error