showing delegation
rails g scaffold delegation voter:references
rails g migration add_position_to_delegation position:integer
rails g scaffold delegation_entry delegation:references delegate_type:string delegate_id:integer position:integer
working on delegation data model
rails g migration add_voter_type_to_delegations voter_type:string
linking
adding delegation
styling
assets
HABTM relationship between Delegation and DelegationEntry
DelegationEntry has a polymorphic association with voter
Delegation model accepts DelegationEntry attributes
Create delegations
Merge pull request #21 from aliismayilov/add-proxy

Add proxy
Merge branch 'develop' of github.com:TheFuturistParty/debate into develop
Merge branch 'add-proxy' into develop

Conflicts:
	spec/factories/users.rb