Merged with Jesse's changes
Trying to make dense matrix
just to pull
just to pull
New modules for algorithms with wikipedia
t
t
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
changed to pull
changed to pull
Merge branch 'master' of https://github.com/shilad/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/conf/ApplicationResources.groovy
	SRSurvey/grails-app/controllers/srsurvey/EmailController.groovy
	SRSurvey/grails-app/views/email/invite.gsp
	SRSurvey/grails-app/views/interest/interest.gsp
	SRSurvey/scripts/invite.sh
Trying to fix the module
Started working with weka files
changed to pull
I pulled form jesse!
Removed the idea file
Removed the idea file
Still fixing the problem
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr
Still fixing the problem