Merge pull request #2 from codefellows/master

Sync it up
Merge pull request #5 from codefellows/master

sync
Merge pull request #6 from codefellows/master

sync it up
Merge pull request #5 from dcorns/master

Sync it up