Change function category to discipline
Add tag category
Merge branch 'master' of github.com:gsbitse/gsb_public