cleaning up
Merge pull request #29 from fishermanswharff/webapp2

cleaning up