Now gets screen size
Merge branch 'master' of https://github.com/ExplosiveHippo/Entropy

Conflicts:
	entropy.py