estimate settings page created for new task
Merge branch 'master' of https://github.com/Zolomon/PlanningPoker.git
created page for stories for new task
merge conflict resolved