populating the database
conflicts in gemfile, database.yml and photo and video controller resolved
Video, Photo, and Q&A tags are all functional
Validations for photo, user and video models added, dropdown nav bar added, and layout of location show page changed
NewsPosts updated
Merge branch 'develop'
conflict resolved in locations views