new app
changed gemfile
added .rvmrc file
fixed conflicts from herkou