new
Merge branch 'master' of https://github.com/kahea/sos-project-2014

Conflicts:
	stage-3.py