fix encoding
Merge branch 'master' of github.com:boyone/fizzbuzz

Conflicts:
	pom.xml