Updated for Iteration 3 goals
Merge remote-tracking branch 'origin/master'