no comment
Merge branch 'master' of https://github.com/solo123/wul

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/solo123/wul