New version of the colorful menu
aa
Merge branch 'master' of https://github.com/teamwavead/demo.git

Conflicts:
	index.html