- There is more that git can do, than there is time :-(

Signed-off-by: Daniel S. Reichenbach <daniel@kogitoapp.com>
Merge branch 'develop' of github.com:danielsreichenbach/presentations into develop

Signed-off-by: Daniel S. Reichenbach <daniel@kogitoapp.com>

Conflicts:
	2013/git-in-business-environments/index.html

Hint: demo merge conflict.