fixed conflicts
Merge pull request #10 from rautsagar/menu_add

fixed conflicts