Update and rename assign2.md to MZhang-assign2.md
added future research questions section
Merge remote-tracking branch 'upstream/master'
Create Stian-assign6
Merge remote-tracking branch 'upstream/master'
the beginning of a section on future research
a6 on finance
Merge pull request #188 from nyborrobyn/master

added to end of report
Update 060_discussion.tex
Merge pull request #187 from serang/patch-9

Create Stian-assign6
Update discussionOverview.tex
Update discussionOverview.tex
Update 080_meta-analysis.tex
Merge branch 'patch-1' of git://github.com/morriszhang/i290m-ocpp-site into morriszhang-patch-1

Conflicts:
	content/assignment2/assign2.md
Update 060_discussion.tex
Merge branch 'master' of github.com:sbenthall/i290m-ocpp-site
Update discussionOverview.tex
Update discussionOverview.tex
updating syllabus
fix slug for mzhang-assign2