Initial commit
merged
Made this a little better, near ready for Mechanical Turk
added db_connect
Merge branch 'master' of github.com:ardentsonata/CSE110 into zacks_server
Site works on zackg.me
Added initial MT questions
Added python mturk stuff
Changed the price for HITs to -zsh.25
Added starter CV code
Merged CV
Initialized Django App
Added south to INSTALLED_APPS, changed DB to postgres
added a wiki folder
added more images
Merge pull request #1 from ardentsonata/add_south

Added south to INSTALLED_APPS, changed DB to postgres
Added requirements.txt and server instructions
Merge pull request #5 from ardentsonata/add_requirements

Added requirements.txt and server instructions, plus gitignore
Merge pull request #4 from ardentsonata/wiki_branch

Wiki branch
First pass at models