Sander Mathijs van Veen 388bdb396f Fix merge conflict. %!s(int64=13) %!d(string=hai) anos
..
cross.png 388bdb396f Fix merge conflict. %!s(int64=13) %!d(string=hai) anos
info.png 388bdb396f Fix merge conflict. %!s(int64=13) %!d(string=hai) anos
load.gif 388bdb396f Fix merge conflict. %!s(int64=13) %!d(string=hai) anos
tick.png 388bdb396f Fix merge conflict. %!s(int64=13) %!d(string=hai) anos