renamed webapp folder to app
Merge branch 'master' of https://github.com/byuCs428CRS/cs428crs

Merged