dropdownery added
What conflict?

Conflicts:
	stylesheets/app.css