Design
Merge branch 'master' of github.com:Radio/fiorito

Conflicts:
	.gitignore
	.idea/workspace.xml