wohou
Merge branch 'conflictify' of github.com:palasthotel/feedvalidator into conflictify

Conflicts:
	style.css