fixed dropdown
Merge

Conflicts:
	css/main.css
	index.html