the thing
Squashed commit of the following:

commit 414acf4f80f3cca22c6185a912745f339bf36064
Author: Johan Enell <johan@enell.nu>
Date:   Tue Dec 9 16:22:57 2014 +0100

    Another change

commit 08c0d8eda43f0871a1aabf8610cc0de07f4e1f89
Author: Johan Enell <johan@enell.nu>
Date:   Tue Dec 9 16:21:38 2014 +0100

    A change
Forgot that line
Merge pull request #3 from enell/develop

Develop