added docs and .emacs file
added src
fixed merge conflict