git color prompt colors and maybe some vim commits
merging stuff
merging more