Merge branch 'master' of github.com:colalife/colalife.github.com into source