Merge pull request #2 from Coms362/master

pulling in ryan's stuff
Hopefully i'm doing this right.. Not sure if code is how it is supposed
to be...
Global travellogkeeper
Merge pull request #10 from Hartman2/master

I feel like i'm going about this the wrong way...
Merge pull request #5 from Coms362/master

Bring in Changes from Master