last push for reals this time?
pointlessly updating the user file
Merge branch 'master' of
https://github.com/lshart/Fall-2014_CSE-360_Sudoku_Project.git

Conflicts:
	data/userList.ser