try to fix the bug
Merge branch 'master' into wwebsite
Refactored cucumber paths.
fix some bugs in the navigation feature
Merge branch 'wwebsite' of https://github.com/aaronjosephs/BTV_project into wwebsite

Conflicts:
	features/support/paths.rb
Merge branch 'master' of https://github.com/aaronjosephs/BTV_project into wwebsite
Updated navigation feature, continued hamburger button feature.
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
Added admin navigation cucumber.
Added login filter to admin controller.
Added step definitions for admin_navigation.
Fixed some cucumber paths.
added create_user
Merge branch 'wwebsite' of https://github.com/aaronjosephs/BTV_project into wwebsite