modified:   README
new file:   bin/build_vim
Merge branch 'master' of github.com:peeterjoot/physicsplay

Conflicts:
	README
deleted:    README
modified:   README.txt