lamps - layout and first function-trying with angular
Merge remote-tracking branch 'origin/master'