added "removed name and added sf"
Merge branch 'master' of github.com:jaek727/test

Conflicts:
	vid