fx
Merge branch 'master' of github.com:sorrymeika/PhotoPrintApp

Conflicts:
	assets.suo