Merge pull request #33 from ZooTypers/master

getting new updates
Merge pull request #34 from ZooTypers/master

getting updates
committing code that checks for when Internet is disconnected.
changed the timer back to 60 secs
merged with the stuff that was updated in master
committing changes with connection errors
Merge pull request #173 from nhlien93/master

pushing updates