added /r to make things better on servers
merging curriculum changes from svn
new images from svn