controller logic added
fixed merge conflict
Merge pull request #2 from sayshay/alex_andrew

controller logic added