mergin'
Friday
kfturt!
Merge remote-tracking branch 'origin/master'

Conflicts:
	PokemonTD/src/com/github/qxu/ptd/pokemon/ExperienceCalculator.java
	PokemonTD/src/com/github/qxu/ptd/pokemon/Pokemon.java
wrfgweerf