adams testing
settling merge conflict
Added chris.txt file.
Merge branch 'develop' of github.com:jongagne-opin/example into develop
messing with the readme
Updating readme.
Updated readme file.
Fixed conflict between adam and chris.
Finishing touches.  Making her nice.
Merge branch 'release/v1.0'