new version
Merge branch 'master' of https://github.com/sierag/jotacross2014

Conflicts:
	style.css