add rails_12factor for heroku assets
Merge branch 'master' of github.com:rhokbrisbane/techgirls_communtiy

* 'master' of github.com:rhokbrisbane/techgirls_communtiy:
  Circle config for Heroku
  Fixing tests
  Removing log/test.log file
  Adding RSpec config file
  Removing user_id column from stories table
  Including Story and Comment admin pages
  Updating README
  remove update path from stories resources
  remove .orig files
  main layout, bootstrap and search view
  adding unicorn
  Adding unicorn

Conflicts:
	Gemfile