hi
Merge branch 'HEAD' of https://github.com/ralampay/woowithwords.git

Conflicts:
	app/views/layouts/application.html.erb
hello