Edit story
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/kampus-2014-2/01-git-task

Conflicts:
	README.md
Merge branch 'master' of https://github.com/kampus-2014-2/01-git-task