adds push
Merge branch 'master' of github.com:nesaro/personal

Conflicts:
	gitconfig