Starting on the sidebar
Merge branch 'master' of github.com:daxtens/planyourpicnic

Conflicts:
	main.py