fixed spelling of my name, need to commit in order to pull
Merge branch 'develop' of git.assembla.com:cis422w13_team3 into develop
Merge branch 'develop' of git.assembla.com:cis422w13_team3 into develop
Finally get ranking vote form working
adding ranking functionality
Merge remote-tracking branch 'assembla/develop'

Conflicts:
	voting/models.py
add a bunch of comments to clarify code
Remove migrations and notifictaions app
Little cleanups
Fix plurality vote counting