upload image and checkbox
Merge branch 'master' of github.com:SpaceComby/SpaceComby

Conflicts:
	Gemfile.lock