Merge pull request #16 from rmcdole/master

done
Merge pull request #17 from rmcdole/master

minor fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #18 from rmcdole/master

final push
Fixed Documents
fixed conflicts
Merge remote-tracking branch 'upstream/master'