Add Person Screen
quizz merge with karol
---
	modified:   index.html
	modified:   less/karol.less
	modified:   less/layout.less
Merge remote-tracking branch 'mmaron/master'

Conflicts:
	less/main.less
Merge with Damian (and karol should merge it! :D)
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'