christian's changes to christina's file
conflict resolution
Merge branch 'master' of github.com:christiannaths/dmitweb-rubytools

Conflicts:
	christina.html