Updated gitconfig & fixed minor bugs
Merge branch 'master' of https://github.com/masternox/stratetic