added rails files
generated video and note models
notes and timestamp concept works
pushed
took out video.js files
played around with video stuff
updated some files..
barely anything changed
fixed conflict
play, pause works. Create notes works
create new and edit both work now
some mad progress
ajax for update form works
ajax works
set up CRUD app actions for videos
added user models with permission types. updated note and video models. note destroy works
minor changes to video_1.js file
Merge branch 'master' of github.com:sarony/flatironvideo
started sessions: controller, new erb and app_controller methods. users not showing
login and authentication works