Specifying with and height of spokenvote logo, so it the content around it doesn't move around when the image is finally downloaded and the browser makes room for it.
Merge remote-tracking branch 'upstream/master' into image-sized-apr03
Re-Enable User Auth to make tests pass and prepare for Al's work
Merge pull request #160 from calasyr/image-sized-apr03

Just setting the width and height in the image tag so things don't move around in the header.
Merge pull request #161 from kimardenmiller/Re-enable-User-Auth

Re enable user auth
My gemfile changes for my laptop
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
Re-Enable User Auth Compelte
Percentage vote tally card. Done. Seems to work...
Merge pull request #162 from kimardenmiller/Hub-modal-complete

Re-Enable User Auth Compelte
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