some for TEKB, and some for server
Merge branch 'master' of https://github.com/ninjaaron/configs

merged with server