Merge branch 'devel' into Ryan_More_Tests
Merge branch 'devel' into Ryan_More_Tests
Merge pull request #32 from SixAppeal/Ryan_More_Tests

Ryan more tests