Started constructing an editor page and routes to get there
correcting merge conmflicts
Added drag and drop clips to the timeline and improved snap and added cropping options
Migrated editor javascript from application.js to timelineEditor.js
Added render pipeline handshakes and routes via ajax json
Merge branch 'master' into ffmpeg_integration

Conflicts:
	Gemfile.lock
	config/routes.rb
modularized the editor so its more organized and stopped the editor from loading site wide
Merge branch 'master' into ffmpeg_integration
Merge pull request #30 from dbcfoxes2014/ffmpeg_integration

Ffmpeg integration