Pre-merge commit
Merge branch 'master' of https://github.com/psal/anonymouth.git

Conflicts:
	src/edu/drexel/psal/anonymouth/gooie/ProgressWindow.java