Work configs
Fixed merge conflicts
Changed user details and added aliases to gitconfig
Redo configs