more nick data
Merge branch 'master' of github.com:prismofeverything/gort
further nick information
resolved conflicts
Merge branch 'master' of github.com:prismofeverything/gort