2014.7.6
file recover

Conflicts:
	.gitignore