Merge branch 'develop' of github.com:RyanNielson/jam-sesh into develop