another commit.  I need to figure out what I'm doing
next one
new commit
Merge branch 'master' of homenet.josephjarriel.com:/home/joseph/GitHub/IP_Update
Merge branch 'master' of homenet.josephjarriel.com:/home/joseph/GitHub/IP_Update
Got remote files
next commit
Push from work
another work commit
Merge branch 'master' of https://github.com/JobenNC/IP_Update

Conflicts:
	README.rst

merge from work