test slide1
Merge branch 'dev' of https://github.com/whittakersc/waza-task into dev

Conflicts:
	app/views/welcome/index.html.erb