added collapsible menu
Merge branch 'master' of https://github.com/florencia-irena/Week2-Demo

Conflicts:
	dummy.js