temp
Merge branch 'master' of https://github.com/tjbwyk/EC_VU_2014

Conflicts:
	src/submission.jar