UVa 10731
Merge branch 'master' of https://github.com/cshung/Competition

Conflicts:
	Competition/main.cpp