Add makeenv function
Added 'n' function, which starts editing a new markdown file
Fix merge conflict