Added file and function headers.
Merge branch 'master' of https://github.com/kapace/yolo-octo-ninja

Conflicts:
	src/client.cpp
	src/server.cpp
Added file and function headers.
Merge branch 'master' of https://github.com/kapace/yolo-octo-ninja

Conflicts:
	src/client.cpp
	src/server.cpp