And more
Urgent bug fixed
Finished feature
Some very productive work
Some very productive work
Refactory
Merge branch 'master' of http://github.com/maxmil/git-playground

Conflicts:
	foo