fixing up syllabus page
Made changes to Syllabus-2013.asciidoc
fixing up homework page
oops merge conflict?