nix
Merge branch 'master' of https://github.com/blackravendb/Project-Pokemon.git
Merge branch 'master' of https://github.com/blackravendb/Project-Pokemon.git
Merge branch 'master' of https://github.com/blackravendb/Project-Pokemon.git
Merged Dennis' player class
Merge branch 'master' of https://github.com/blackravendb/Project-Pokemon.git