rebased changes from upstream
Sprint 2 plan

Added a plan for my sprint 2
Merge pull request #137 from StephenKappel/gh-pages

My Sprint 2 iteration plan