work this time
Merge branch 'master' of http://github.com/csev/si664-w13