ui changes and such
Merge branch 'master' of https://github.com/juste119/LittleShoePeople.git
Merge branch 'master' of https://github.com/juste119/LittleShoePeople.git