add move dictionary and charmander
Merge branch 'master' of ssh://github.com/MichaelRevell/pokemon

Conflicts:
	Pokemon.xcodeproj/project.pbxproj