add markdown
update server.py
Merge branch 'develop' of github.com:frankdede/CMPUT410W14T07 into develop

Conflicts:
	server.py
merge