Edit Project WBS_140421
Menu2.html deleted
Merge branch 'master' of github.com:gold9ine/MusicHarmony

Conflicts:
	FrontWebPage/MusicHarmony/public/css/layout.css