Bye bye brian branch
Added basic Schedule Model
resolving merge conflicts
resolving merge