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

Conflicts:
	config/routes.rb