-mfixed merge conflicts
Merge branch 'master' of github.com:kfreedland/CS169GAP