syncing with macbook
Merge branch 'gh-pages' of https://github.com/IsaKiko/Exp2 into gh-pages

Conflicts:
	text1.html