Merge branch 'master' of git@github.com:zeroghj/bobthebuilder.git into NewLayout
added message
Merge remote-tracking branch 'upstream/NewLayout'
version update
Merge pull request #14 from Jay1/master

version update