just gitignore adds rubbish dir
adds all subdirectories of rubbish
some deleted files
Merge branch 'master' of github.com:dimkir/SocialSketch

Conflicts:
	.gitignore