directory cleaning
Merge branch 'master' of https://github.com/browles/surf

Conflicts:
	.gitignore