new file:   autoload/potion/running.vim
    new file:   doc/potion.txt
    new file:   ftplugin/potion/running.vim
    modified:   syntax/potion.vim
    modified:   test/factorial.pn
Merge branch 'master' of https://github.com/FuDesign2008/potion.vim

Conflicts:
	autoload/potion/running.vim
	ftplugin/potion/running.vim

    modified:   autoload/potion/running.vim
    modified:   ftplugin/potion/running.vim