landscape menu
Merge branch 'master' of https://github.com/nielk/nantes-nord

Conflicts:
	src/assets/styles/main.css