Change done exclusively to generate a merge conflict
Merge branch 'conflict-branch' into gh-pages

Conflicts:
	index.html
Make the design a little bit more responsive.

It's 2013 after all...
Definiciones.
Tabla
Typos.
Adding some source code...
Merge branch 'responsive' into gh-pages

Conflicts:
	screen.css
who else is playing?
linking to commit and file.