Update and rename assign2.md to MZhang-assign2.md
Merge branch 'patch-1' of git://github.com/morriszhang/i290m-ocpp-site into morriszhang-patch-1

Conflicts:
	content/assignment2/assign2.md
Merge branch 'master' of github.com:sbenthall/i290m-ocpp-site