Matt commit
Merge branch 'master' of github.com:szarmes/dbProject

Conflicts:
	.gitignore
	.rspec
	.secret
	Gemfile
	Gemfile.lock
	Guardfile
	README.md
	Rakefile
	app/assets/contact/new.html.erb
	app/assets/images/.keep
	app/assets/javascripts/application.js
	app/assets/javascripts/contact.js.coffee
	app/assets/javascripts/custom.js
	app/assets/javascripts/sessions.js.coffee
	app/assets/javascripts/static_pages.js.coffee
	app/assets/javascripts/users.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/contact.css.scss
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/sessions.css.scss
	app/assets/stylesheets/static_pages.css.scss
	app/assets/stylesheets/users.css.scss
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/helpers/contact_helper.rb
	app/helpers/static_pages_helper.rb
	app/helpers/users_helper.rb
	app/mailers/.keep
	app/models/.keep
	app/models/card.rb
	app/models/course.rb
	app/models/deck.rb
	app/models/favorite_card.rb
	app/models/favorite_deck.rb
	app/models/rating.rb
	app/models/recent_deck.rb
	app/models/subject.rb
	app/models/user.rb
	app/uploaders/avatar_uploader.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/....html.erb
	app/views/static_pages/home.html.erb
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/devise.rb
	config/initializers/filter_parameter_logging.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/devise.en.yml
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
	db/seeds.rb
	lib/assets/.keep
	lib/tasks/.keep
	lib/tasks/sample_data.rake
	log/.keep
	public/404.html
	public/422.html
	public/500.html
	public/assets/application-0dfba5e6865c4c9ed8e08b31e54f9a04.js
	public/assets/application-0dfba5e6865c4c9ed8e08b31e54f9a04.js.gz
	public/assets/application-4ab8ed6c16f4f87251a5266261707640.js
	public/assets/application-4ab8ed6c16f4f87251a5266261707640.js.gz
	public/assets/application-56548d6db14f2e0d76abad2a5dc630bf.css
	public/assets/application-56548d6db14f2e0d76abad2a5dc630bf.css.gz
	public/assets/application-97c4acd6de794d4c4f58a8be08368f89.css
	public/assets/application-97c4acd6de794d4c4f58a8be08368f89.css.gz
	public/assets/application-a71eafb28db4e1fd56a893e19f591581.css
	public/assets/application-a71eafb28db4e1fd56a893e19f591581.css.gz
	public/assets/application-b6326aa027912de61cdbaacfd87a8d4c.js
	public/assets/application-b6326aa027912de61cdbaacfd87a8d4c.js.gz
	public/assets/application-b80a28857326546f98c741505ea5ba0a.css
	public/assets/application-b80a28857326546f98c741505ea5ba0a.css.gz
	public/assets/application-f1a14051f17824976271b9c0460232f0.css
	public/assets/application-f1a14051f17824976271b9c0460232f0.css.gz
	public/assets/application-f303ff8936fd8f65c88a4bf619b6040c.js
	public/assets/application-f303ff8936fd8f65c88a4bf619b6040c.js.gz
	public/assets/application-fd96f8026e84eb8c8d3ac594b17df543.css
	public/assets/application-fd96f8026e84eb8c8d3ac594b17df543.css.gz
	public/assets/glyphicons-halflings-c806376f05e4ccabe2c5315a8e95667c.png
	public/assets/glyphicons-halflings-white-62b67d9edee3db90d18833087f848d6e.png
	public/assets/main-6338d3cee0f4075156e43806c59f8d79.jpg
	public/assets/main-69db179627bdc88e60e5a059e7b2bf22.png
	public/assets/manifest-98c94c4f09c0247e66c5e27340098a96.json
	public/assets/mrd-1c058319c8cd342054887d291bf63a64.png
	public/assets/rails-a54600e8f2699ca69d032287d98c11b9.png
	public/assets/ss-231c438c3a19ca14e130be3f0c0157c8.jpg
	public/favicon.ico
	public/robots.txt
	spec/spec_helper.rb
	vendor/assets/javascripts/.keep
	vendor/assets/stylesheets/.keep