added.cat
added a;;
made it wrong
Merge branch 'master' of https://github.com/codesku/code-school-git

Conflicts:
	a.txt