first commit jan7
Merge branch 'master' of http://github.com/LaurenHearnden/lighthouse-team