Beginning of session work
fixes conflicts
sessions working
Sessions added (finally)
Merge branch 'master' of https://github.com/TheyShouldHaveATeam/TheyShouldHaveThis