Initial commit
	new file:   .gitignore
	new file:   Gemfile
	new file:   Gemfile.lock
	new file:   README.rdoc
	new file:   Rakefile
	new file:   app/assets/images/.keep
	new file:   app/assets/images/video.jpg
	new file:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/logins.js.coffee
	new file:   app/assets/javascripts/main_page.js.coffee
	new file:   app/assets/javascripts/ui.js.coffee
	new file:   app/assets/javascripts/users.js.coffee
	new file:   app/assets/javascripts/videoshops.js.coffee
	new file:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/logins.css.scss
	new file:   app/assets/stylesheets/main_page.css.scss
	new file:   app/assets/stylesheets/scaffolds.css.scss
	new file:   app/assets/stylesheets/ui.css.scss
	new file:   app/assets/stylesheets/users.css.scss
	new file:   app/assets/stylesheets/videoshops.css.scss
	new file:   app/controllers/application_controller.rb
	new file:   app/controllers/concerns/.keep
	new file:   app/controllers/logins_controller.rb
	new file:   app/controllers/ui_controller.rb
	new file:   app/controllers/users_controller.rb
	new file:   app/controllers/users_controller_old.rb
	new file:   app/controllers/videoshops_controller.rb
	new file:   app/helpers/application_helper.rb
	new file:   app/helpers/logins_helper.rb
	new file:   app/helpers/main_page_helper.rb
	new file:   app/helpers/ui_helper.rb
	new file:   app/helpers/users_helper.rb
	new file:   app/helpers/videoshops_helper.rb
	new file:   app/mailers/.keep
	new file:   app/models/.keep
	new file:   app/models/concerns/.keep
	new file:   app/models/preference.rb
	new file:   app/models/preference_old.rb
	new file:   app/models/transactions.rb
	new file:   app/models/transactions_old1.rb
	new file:   app/models/transactions_old2.rb
	new file:   app/models/user.rb
	new file:   app/models/user_old.rb
	new file:   app/models/videoshop.rb
	new file:   app/views/layouts/application.html.erb
	new file:   app/views/logins/action.html.erb
	new file:   app/views/logins/create.html.erb
	new file:   app/views/logins/loginPage.html.erb
	new file:   app/views/logins/watch.html.erb
	new file:   app/views/users/_form.html.erb
	new file:   app/views/users/edit.html.erb
	new file:   app/views/users/index.html.erb
	new file:   app/views/users/index.json.jbuilder
	new file:   app/views/users/new.html.erb
	new file:   app/views/users/show.html.erb
	new file:   app/views/users/show.json.jbuilder
	new file:   app/views/users_old/_form.html.erb
	new file:   app/views/users_old/edit.html.erb
	new file:   app/views/users_old/index.html.erb
	new file:   app/views/users_old/index.json.jbuilder
	new file:   app/views/users_old/new.html.erb
	new file:   app/views/users_old/show.html.erb
	new file:   app/views/users_old/show.json.jbuilder
	new file:   app/views/videoshops/_form.html.erb
	new file:   app/views/videoshops/edit.html.erb
	new file:   app/views/videoshops/index.html.erb
	new file:   app/views/videoshops/index.json.jbuilder
	new file:   app/views/videoshops/new.html.erb
	new file:   app/views/videoshops/show.html.erb
	new file:   app/views/videoshops/show.json.jbuilder
	new file:   bin/bundle
	new file:   bin/rails
	new file:   bin/rake
	new file:   config.ru
	new file:   config/application.rb
	new file:   config/boot.rb
	new file:   config/database.yml
	new file:   config/environment.rb
	new file:   config/environments/development.rb
	new file:   config/environments/production.rb
	new file:   config/environments/test.rb
	new file:   config/initializers/backtrace_silencers.rb
	new file:   config/initializers/cookies_serializer.rb
	new file:   config/initializers/filter_parameter_logging.rb
	new file:   config/initializers/inflections.rb
	new file:   config/initializers/mime_types.rb
	new file:   config/initializers/session_store.rb
	new file:   config/initializers/wrap_parameters.rb
	new file:   config/locales/en.yml
	new file:   config/routes.rb
	new file:   config/secrets.yml
	new file:   db/migrate/20140815080029_create_videoshops.rb
	new file:   db/migrate/20140815151406_add_index_to_videos.rb
	new file:   db/migrate/20140815152214_create_users_old.rb
	new file:   db/migrate/20140815152745_add_index_to_users.rb
	new file:   db/migrate/20140816105913_add_sessions_table.rb
	new file:   db/migrate/20140818203126_create_preferences.rb
	new file:   db/migrate/20140818204421_create_transactions.rb
	new file:   db/schema.rb
	new file:   db/seeds.rb
	new file:   lib/assets/.keep
	new file:   lib/tasks/.keep
	new file:   log/.keep
	new file:   public/404.html
	new file:   public/422.html
	new file:   public/500.html
	new file:   public/favicon.ico
	new file:   public/robots.txt
	new file:   test/controllers/.keep
	new file:   test/controllers/logins_controller_test.rb
	new file:   test/controllers/main_page_controller_test.rb
	new file:   test/controllers/ui_controller_test.rb
	new file:   test/controllers/users_controller_test.rb
	new file:   test/controllers/videoshops_controller_test.rb
	new file:   test/fixtures/.keep
	new file:   test/fixtures/preferences.yml
	new file:   test/fixtures/transactions.yml
	new file:   test/fixtures/users.yml
	new file:   test/fixtures/videoshops.yml
	new file:   test/helpers/.keep
	new file:   test/helpers/logins_helper_test.rb
	new file:   test/helpers/main_page_helper_test.rb
	new file:   test/helpers/ui_helper_test.rb
	new file:   test/helpers/users_helper_test.rb
	new file:   test/helpers/videoshops_helper_test.rb
	new file:   test/integration/.keep
	new file:   test/mailers/.keep
	new file:   test/models/.keep
	new file:   test/models/preference_test.rb
	new file:   test/models/transactions_test.rb
	new file:   test/models/ui_test.rb
	new file:   test/models/user_test.rb
	new file:   test/models/videoshop_test.rb
	new file:   test/test_helper.rb
	new file:   vendor/assets/javascripts/.keep
	new file:   vendor/assets/stylesheets/.keep
Merge branch 'master' of https://github.com/ag-devl/Fullscreen_Application