testing branch
Merge branch 'helen' of https://github.com/stuycs-softdev/Vikings into helen

Conflicts:
	util.py
testing