pg working on localhost
Merge branch 'master' of github.com:sarony/flatironvideo
gemfile updated
vendor compiled assets
rails 12 factor gem added
got sign-up-form to work finally
finished up new template for users
/new
added validations to users model
validations are working, working on flash notices
validations, error messages are working
took out asterisk in _error_messages.html.erb template
setting up videojs, switching from html5
Merge branch 'site-design'
html5 video for now
fixed errors with js
videos/show, videos.css modified
resolved merge conflicts
changes were made to videos.css, application.html
resolved merge conflicts, got the progress bar working
changes made to video.css file