showing merge commits
Merge branch 'master' of https://github.com/subbarao/poll

* 'master' of https://github.com/subbarao/poll:
  added candidates info model and controller