user token stuff
Merge branch 'develop' of https://github.com/ayau/octo-nemesis into develop
Merge branch 'develop'
Merge branch 'master' of https://github.com/ayau/octo-nemesis