Squashed commit of the following:

commit afdc6c121511c254c79a5fc28c3523264c10d135
Merge: 225e860 6fcde1f
Author: guy@moment.me <guysopher@gmail.com>
Date:   Sat Nov 22 14:20:18 2014 +0200

    Merge branch 'master' into temp1

commit 225e8607f988b5fd34a15142828fe5d3dfea0c34
Author: guy@moment.me <guysopher@gmail.com>
Date:   Sat Nov 22 14:19:18 2014 +0200

    branch add