PDF dragging
correction
Merge branch 'master' of github.com:HackathonBB/notesync

Conflicts:
	app/assets/stylesheets/application.css