Fixed naming issues
Merge branch 'master' of https://github.com/qog314/prog3

Conflicts:
	mysubmit.c