merge
Merge branch 'master' of github.com:jellea/newswheel
Merge branch 'master' of github.com:jellea/newswheel