B added
Merge branch 'master' of https://github.com/tppalani/www

Conflicts:
	clean.txt