Fixed merge conflict in admin_controller.rb
Fixed merge conflict in admin_controller.rb

brokenfingers/SFVS,brokenfingers/SFVS,brokenfingers/SFVS,neilkumar101/CS169_SFVS,neilkumar101/CS169_SFVS,neilkumar101/CS169_SFVS,neilkumar101/CS169_SFVS