More design
Merge branch 'master' of github.com:Papiel/papiel-ocr

Conflicts:
	templates/index.html