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

Conflicts:
	app/assets/stylesheets/style.css.scss
hi
Merge branch 'HEAD' of https://github.com/ralampay/wowlit.git

Conflicts:
	app/assets/stylesheets/style.css.scss
hi
Merge branch 'HEAD' of https://github.com/ralampay/wowlit.git
hi
Merge branch 'HEAD' of https://github.com/ralampay/wowlit.git