Quiz update counter + question
	modified:   ems-layout.html
	modified:   index.html
	modified:   js/custom.js
	modified:   less/karol.less
quizz: update players & add font awesome
---
	new file:   css/font-awesome.css
	modified:   ems-layout.html
	new file:   fonts/FontAwesome.otf
	new file:   fonts/fontawesome-webfont.eot
	new file:   fonts/fontawesome-webfont.svg
	new file:   fonts/fontawesome-webfont.ttf
	new file:   fonts/fontawesome-webfont.woff
	modified:   index.php
	modified:   less/layout.less
	modified:   person.php
Merge remote-tracking branch 'karol/master'

Conflicts:
	index.html
	less/karol.less
quizz: remove index.html
---
	deleted:    index.html
	modified:   index.php
	modified:   less/layout.less
quizz: add icons
Updated
Merge remote-tracking branch 'dd/master'
quizz: chenge size px to em
---
	modified:   index.php
	modified:   less/layout.less
Upek
Merge remote-tracking branch 'dd/master'
quizz: add class when more than 4 players
Merge remote-tracking branch 'dd/master'
Merged with Damian, added file for intro

	modified:   index.php
	new file:   intro.php
	modified:   less/karol.less
	new file:   scores.php
quizz: score changes
---
	modified:   less/main.less
	new file:   less/score.less
	new file:   score.php
Intro page updated
	modified:   intro.php
	new file:   less/intro.less
	modified:   less/main.less
	new file:   nyancat.ogg
quizz: score page & add some animations
---
	modified:   index.php
	modified:   js/custom.js
	modified:   less/animations.less
	modified:   less/layout.less
	modified:   less/person.less
	modified:   less/score.less
	modified:   score.php
Intro page prepeare
	modified:   intro.php
	modified:   js/custom.js
	modified:   less/intro.less
Merge remote-tracking branch 'dd/master'

Res. Conflicts:
	js/custom.js
Quizz: Merge With Damian
Merge remote-tracking branch 'karol/master'