Show changes
Merge branch 'development' of github.com:Finnja/thebook into development

Conflicts:
	app/views/rushees/show.html.erb

End of js voting :( RIP
Merge branch 'development' of github.com:Finnja/thebook into development

Merge message