Squashed commit of the following:
Squashed commit of the following:

commit d181fc3954c8655530f50ca60a0c017ff3469734
Author: Lars Kruse <lak@praqma.net>
Date:   Tue Jan 13 14:35:33 2015 +0100

    normal

commit 36705d1f5746bb5ecdae84d19ddb46c308441a29
Merge: 7689fea 1dca281
Author: Lars Kruse <lak@praqma.net>
Date:   Tue Jan 13 14:34:27 2015 +0100

    Merge branch 'master' of github.com:josra/josra.github.io into lak

commit 7689fea6ffa6d74c3e510d061e9ee05f178c264d
Author: Lars Kruse <lak@praqma.net>
Date:   Tue Jan 13 14:32:19 2015 +0100

    Bold

josra/josra.github.io,josra/josra.github.io