added set window size
Merge
Merge branch 'mlj5tq' of https://github.com/jackmacattack/Fred.git

Conflicts:
	user_input.py
Merge branch 'master' of https://github.com/jackmacattack/Fred.git

Conflicts:
	server.py