update
Merge branch 'master' of https://github.com/paulsutcliffe/golabs

* 'master' of https://github.com/paulsutcliffe/golabs:
  tesxtos

Conflicts:
	app/views/home/index.html.haml