Added a category menu and the header minimizes on scroll
Merge branch 'master' of https://github.com/oliver-spryn/merchancs

Conflicts:
	index.html
	styles/main.css