Update from Aptana
Merge branch 'master' of https://github.com/julieancm/rails08

Conflicts:
	demo/app/views/say/hello.html.erb