Added web to master
Merge branch 'master' of https://github.com/NCSUWebClass/spring14-bambooweather