Merge branch 'master' of https://github.com/tcard/git-fixture

# Conflicts:
#	go/example.go
#	haskal/haskal.hs
