push for cody
Merge remote-tracking branch 'Joey/master'
Push with Joeys changes merged and fixed; Switch Pokemon WORKING!!!ish