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
setting up adding multiple users
Merge pull request #26 from Colt/master

Add Amazon S3 Hosting
Merge pull request #25 from jeesong/master

Added username for Users
setting up adding multiple users
fix merge conflicts
Merge branch 'master' into multiple_users
working on amazon s3 hosting
changing amazon hosting again
Merge pull request #27 from Colt/master

Amazon Security Keys
setting up adding multiple users
fix merge conflicts
still working on adding users to board
fix merge conflicts
removed conflicts