fixed references to location
resolved the conflicts
fixed seeds.rb
Merge branch 'master' of github.com:philipppahl/spokenvote