Merged Conflicts
Merge branch 'master' of https://github.com/chankan/SmartKanteen
Functionality:creating Order  and homepage.