hebrew part 2
Merge branch 'master' of https://github.com/ypodo/prototype

Conflicts:
	app/views/pages/_about.html.erb