Add player entry screen
Merge branch 'master' of github.com:ChrisH91/Pokebooze
Further game logic
Updated TODO list
Merge branch 'master' of https://github.com/ChrisH91/Pokebooze
Merge branch 'master' into pokeengine

Conflicts:
	README.md
Add flash, comic sans all the things
Merge branch 'master' of github.com:ChrisH91/Pokebooze
Updated TODO list
Merge branch 'master' of https://github.com/ChrisH91/Pokebooze
Game logic up to tentacool
Updated todo list
Merge branch 'master' into pokeengine
Game logic up to Pokemon Master. Booyah