added info to readme
Merge branch 'DeanGilewicz-master'

* DeanGilewicz-master:
  added info to readme
  Update README.md
Fixed merge conflicts