added ruby rvm files
image.rb deleted
added puma
added git_hooks
image.rb deleted ... i think
fixed puma sample config
fixed git hook
added some stuff on the index view
Merge remote-tracking branch 'origin/production' into develop

Conflicts:
	config/puma.sample.rb
	git_hooks/post-receive