.gitignore fix
Merge branch 'master' of github.com:ouyoutouchmytralala/image_my_web

Conflicts:
	Gemfile.lock