Merge branch 'master' of github.com:bstreete/acic-14-group4