Update 'Gemfile.lock'
Remove magic comment for enconding
Add settings for use in factory_girl
Fix 'Procfile'
Remove unnecessary comments in 'Rakefile'
Merge branch 'master' into write_specs

Conflicts:
  Gemfile.lock
Execute 'rails g factory_girl:model girl'