getting github to work
Pretty comments

I commented everything so far =p
Updated comments
Merge pull request #2 from htown101/master

Heather's attempt at getting github to work