On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   setupvim
Merge branch 'master' of https://github.com/leerkan/visi-pivi-sivi
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   pffs
	new file:   setupopenvpn