merging
Merge branch 'master' of https://github.com/walterm/lamp
Merge branch 'master' of https://github.com/walterm/lamp
adding plant and beam