Fixed python version to count to 100, added Java version
Merge branch 'master' of github.com:lunemec/FizzBuzz

Conflicts:
	fizzbuzz.py