Añadidos cambios de wikipedia y local storage
Merge branch 'Adrian'

Conflicts:
	views/main.coffee