Newline
Fixed merge
Merge branch 'develop' into jared

* develop:
  Added a few more lines ot this
My changes
Merge pull request #6 from jared-bridg/jared

Jared