welcome screen
Merge branch 'master' of https://github.com/theguice/holiday-viz

Conflicts:
	_css/main.css
	_js/user-operations.js