asdasd
'lalala
Merge branch 'master' of https://github.com/kampus-2014-2/01-git-task

Conflicts:
	README.md

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