add ruby version
schema
merge conflict
merge conflict
Merge branch 'master' of https://github.com/ElizabethU/Scheduler
Merge branch 'master' of https://github.com/ElizabethU/Scheduler
take out typo in application.html.erb
merge conflict