Fixed user input prompting
Merge branch 'master' of https://github.com/clee-cmu/soc

Conflicts:
	Week7HW/DBLPParser.java