combined the programs
Merge branch 'master' of heroku.com:musickids into yifan/schedule-combine