Code prettify
Merge branch 'master' of github.com:LuRsT/My-Setup