Syncing up 13/01/14
Merge branch 'master' of https://github.com/Al153/Programming

Conflicts:
	Python/Quantum bits and bobs/Scripting.py