asd
Merge pull request #1 from Patlog/master

Design stuff