20140808
20140808
Merge branch 'master' of https://github.com/dibery/UVa

Conflicts:
	update.bat