added auto-remote add when init-ing
Merge branch 'master' of github.com:TDC-bob/bobgit

Conflicts:
	git.py
Merge branch 'master' of https://github.com/TDC-bob/bobgit
forgot to include remote name in remote_add function
Merge branch 'master' of https://github.com/TDC-bob/bobgit
should have fixed initial init
Merge branch 'master' of https://github.com/TDC-bob/bobgit
switched strategy to reset --hard
Merge branch 'master' of https://github.com/TDC-bob/bobgit
using merge -X theirs strategy
Merge branch 'master' of https://github.com/TDC-bob/bobgit
moved ENV to beginning of script, silly me