removed extra white spaces for readability
Added public/uploads to .gitifnore
.ruby-* files for convenience (used by RVM/rbenv for automatic switching)
updated schema.rb according to migrations
merge resolved