CSV- HAlfway
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/controllers/admin_controller.rb
JS?
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/popUp.js
	app/assets/stylesheets/style.css
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
CSV-->Done