small updates
Merge branch 'development'
adding laguardia stuff
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development