First configure files
Fixing makefile
Merge branch 'master' of https://github.com/WardenQQ/Config