added jadon's s3
Merge branch 'master' of github.com:bogiebro/classapp