putting assets back
Merge branch 'master' of https://github.com/walterm/lamp