initial commit
clean up added.
add .gitignore
Merge branch 'master' of github.com:dwyang/CBIR

Conflicts:
	.gitignore