Raffi push
Merge branch 'master' of https://github.com/szarmes/dbProject

Conflicts:
	app/controllers/browse_controller.rb
	app/controllers/cards_controller.rb
	app/controllers/decks_controller.rb
	app/views/browse/index.html.erb
	app/views/cards/favorite.html.erb
	app/views/decks/favorite.html.erb
	app/views/decks/index.html.erb
	app/views/decks/recent.html.erb
	app/views/decks/your_decks.html.erb
	app/views/shared/_decks.html.erb