Initial commit
Resolved conflicts from intial merge
Removed ip from prompt and forced color