remove file doesn't need track
Merge branch 'master' of https://github.com/gabrieltong/rails-baocheng

Conflicts:
	vendor/assets/clean-canvas-wrap/.DS_Store
	vendor/assets/clean-canvas-wrap/css/.DS_Store