Merge branch 'user'
Merge branch 'master' of github.com:JavaRabbit/UselessJunk
Merge branch 'master' of github.com:JavaRabbit/UselessJunk