Merge branch 'master' of https://github.com/yoavz/lahacks-site

Conflicts:
	views/index.html