adding winner algorithms
Merge branch 'develop' of git.assembla.com:cis422w13_team3 into develop
Update api for RuiQi to test
parse json manually
Commit just so that RuiQi can access the API
adding algorithms for plurality, borda
Merge Jonathan's code for vote types
fixing plurality method
Fixes the clown
fixed indentation error that prevented runserver
fix get winnter
Merge branch 'develop' of git.assembla.com:cis422w13_team3 into develop

Conflicts:
	voting/models.py
add vote closed to the api
Save the vote on completion
scope the membervotes in the api to the request-appropriate user
Fix up user profile form