fix merge
fix merge
fix merge error
deleted jquery
expert schedule view now creates and destroys records
fixed schedule view routing
all the js files we dont need
work
merging
Merge branch 'master' of github.com:staxworks/maximilian-the-dog
change to many-to-many vs. poly
idenam
i have no idea what is going on
Merge branch 'master' of https://github.com/staxworks/maximilian-the-dog
fix merge
fix merge
fix merge
fixed bootstrap switch error
fixed missing schedule ajax and route
recovered new schedule html lost in merge