cleaned directory
gitignore
gitignore of
Merge branch 'master' of https://github.com/mennieshen/Shen_algo2013

Conflicts:
	.gitignore