start merging index with angular into schedule.php, and move file structure
Merge branch 'master' of https://github.com/jeremywrnr/Hajim-plan