aasasd
Merge branch 'master' of https://github.com/arturo-qr/fantazmus

Conflicts:
	css/styles.css