changed to username
Merge branch 'master' of github.com:lthomas93/Mmaroster