Delete 486562.jpg

clean the cache
some repairs
change the gitignore setting
Merge branch 'master' of github.com:Franciscowxp/NewLife
Merge branch 'master' of github.com:Franciscowxp/NewLife

Conflicts:
	.gitignore
	newlife/static/Gruntfile.js
repair of the merge
add installing progammer
want to add a install page,but it failed.there is some problem need to be solved.just note