Updates
Merge branch 'master' of https://github.com/linuxdemon1/Random-Python-Dev

Conflicts:
	Encoders/Encode.py