Cleaned up comments
Fixed a couple merge conflicts
Merge pull request #9 from annechristy/internetChecks

Internet checks