stuff
Merge branch 'master' of https://github.com/ezdon/COMP1_2014

Signed-off-by: Adam McNicol <adam@mcnicol.me>

Conflicts:
	Skeleton Program.py
	save_scores.dat