Edited file in emacs
Fixed staging bugs in develop branch