font resizing
font resizing
Merge branch 'master' of https://github.com/florencia-irena/Week2-Demo

Conflicts:
	dummy.js
	explist.html
	explist.js