resolve conflict
Merge branch 'master' of https://github.com/PhoenixRockit/3rd-degree
Merge branch 'master' of https://github.com/PhoenixRockit/3rd-degree
moved category in a little