Updated commit time
Editted help in makefile
Did some server stuffs
Merging complete