readme test
small bug fixes
merge conflict fix
Merge branch 'belindahare-master'
merge conflict fix
Merge pull request #25 from belindahare/master

small bug fixes
Merge pull request #22 from jimrambow/master

started on working with the photo uploader
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/CorundumConundrum