Trying to get my name to show up on commits
Merge branch 'master' of https://github.com/38DaysLater/M2