Merge pull request #1 from samsony/video

Video
Merge pull request #2 from samsony/video

Test scaffold
Merge pull request #3 from samsony/video

Test scaffolding
Merge pull request #4 from samsony/video

Add features
split up video page

added sumbit video
Converted submit_video.html to haml code
Converted video.html to HAML
Merge branch 'master' of https://github.com/Bknotz/BTV_project

Conflicts:
	.DS_Store
	.gitignore
	Gemfile
	Gemfile.lock
	config/routes.rb
	features/step_definitions/web_steps.rb
	features/support/env.rb
	features/support/paths.rb
	features/support/selectors.rb
	lib/tasks/cucumber.rake
Resolved routes.rb diff
Merged Gemfiles. Added user_role model. Updated DB.
Added model associations
Merge branch 'master' into wwebsite

Conflicts:
	features/support/paths.rb
merge with the master(video branch added)
Merge branch 'wwebsite' of https://github.com/aaronjosephs/BTV_project into wwebsite

Conflicts:
	Gemfile.lock
added admin, show_users, show_requests pages
Added users table for admin/show_users
added edit user page
added edit_user_page
Merge branch 'master' of https://github.com/aaronjosephs/BTV_project
Fixed merge conflicts