Add d3-rails
Add Omniauth
Add application seed
Merge branch 'master' of github.com:milafrerichs/votenow
Merge branch 'master' of github.com:milafrerichs/votenow
Add Categories to seed-data
Merge branch 'master' of github.com:milafrerichs/votenow
Add requirement of d3 to application.js
Add foreman to fix env
Merge branch 'master' of github.com:milafrerichs/votenow
Add simple show view for applications
Merge branch 'master' into angular

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/applications_controller.rb