updating
Merge branch 'master' of github.com:Snugug/lighthouse