My gemfile changes for my laptop
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Percentage vote tally card. Done. Seems to work...
Merge branch 'master' of https://github.com/railsforcharity/spokenvote into 2013-04-03-dojo-hack-session
Fix issue with replacing \n with <br> that was creating an error.
move percentage into div at the top of the proposal doc. this is more betterer it would seem.
Removed Caleb's Gem file and Gem lock changes
Merge pull request #165 from kimardenmiller/2013-04-03-dojo-hack-session-Gem-Changes-removed

2013 04 03 dojo hack session gem changes removed