New bugs n shit
Merge branch 'master' of github.com:ChrisH91/Pokebooze

Conflicts:
	README.md