Big manual merge

This commit is contained in:
Caleb James DeLisle
2017-08-04 11:20:17 +02:00
71 changed files with 3489 additions and 1004 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 135 B