yay helen and dina did stuff that was productive (helen watched)
Merge branch 'master' of https://github.com/stuycs-softdev/Vikings