Merge branch 'master' into kaiks
rzygi
Conflicts:
	SQL/model fizyczny.sql
	quiz_management/app/controllers/quiz_controller.rb
	quiz_management/app/models/odpowiedz_uzytkownika.rb
	quiz_management/app/models/ranking.rb
Merge branch 'kaiks' of https://github.com/jam231/quizy into kaiks

Conflicts:
	SQL/model fizyczny.sql
	quiz_management/app/controllers/quiz_controller.rb
	quiz_management/app/models/ranking.rb