add .bashrc
add vsftpd.conf (FTP server)
Merge branch 'master' of github.com:MFolschette/raspconfig

Conflicts:
	.bashrc
	places