Ale changed one-page-wonder
Merge branch 'master' of https://github.com/sanchezz93/PaginaACMTest

Conflicts:
	one-page-wonder/one-page-wonder.html

images and other small stuff