workspace added to ignore
workspace removed from ignore
Merge branch 'master' of https://github.com/Radio/fiorito

Conflicts:
	.gitignore
wp configured