Updated git config to be my email, added color highlighting to git branches
resolved upstream conflics