stuff from a year ago
Merge remote-tracking branch 'remotes/origin/master'

Merging the readme
changed README and moved stuff around