Moved code around a bit
Merge branch 'master' of github.com:alicexigao/wisdomOfCrowds
Moved some code for the interface around