fix conflict again ugh fuck
add checkbox, not working yet
fix conflict again ugh fuck
add checkbox, not working yet
add amazon s3 hosting
Merge branch 'master' of https://github.com/Colt/tinytalk
Merge pull request #26 from Colt/master

Add Amazon S3 Hosting