Merge branch 'master' of github.com:waveaccounting/hackdays-onboarding-frontend

Conflicts:
	app/data/steps.json
	app/index.html
	app/styles/custom.css
	app/views/welcome.html