Merge pull request #6 from kcnklub/River

Merge pull request #5 from kcnklub/master
I haven't changed anything just doing an update too git all changes were autochanges
I have fixed the resolution problem that we have been experiencing
Merge branch 'master' into Kyle
Merge pull request #7 from kcnklub/Kyle

merging with my project