Just because I can.
Merge branch 'master' of github.com:jjdekker/goupa

Conflicts:
	tokenizer/tokenizer.go