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

Conflicts:
	Problems.xlsx
20140610