Merge remote-tracking branch 'Cody/master'
created game class to work with instead of temp battle
???
Merge remote-tracking branch 'Joey/master'