Update

Erica's Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.md
Merge branch 'master' of https://github.com/GoingAgile/2014-10-CSD

Conflicts:
	readme.md