Added a little hack to prevent merge conflicts with the student assignments for now.
Added a little hack to prevent merge conflicts with the student assignments for now.

svn path=/webdsls/trunk/; revision=1027

webdsl/webdsl,webdsl/webdsl,webdsl/webdsl,webdsl/webdsl