Spain golang 2013
Merge branch 'master' of github.com:homburg/spain2013-golang

Conflicts:
	README.md