conflicts suck
jlkj
Merge branch 'master' of https://github.com/trioserver/design.git
deleted Design Project
deleted smth
First Design progress. Window factory add