Merge pull request #3 from nicklynchjonely/master

Updating contents
Merge pull request #11 from ccarmen/master

Merge pull request #3 from nicklynchjonely/master