added some sweet photos
fixed some merge conflicts
Merge branch 'master' of github.com:Tambling/whetstone