Added username stuff
Merge branch 'master' of github.com:thekenner33/phonesmash