Minor tweaks
merge conflicts resolved
fixed merge conflicts
Merge pull request #12 from alexabbott/Brian'sBranch

Brian's branch
New fixes
Merge branch 'master' into alex
comit
commit
Merge branch 'master' of https://github.com/alexabbott/business_guide
Merge branch 'ericsbranch' of https://github.com/alexabbott/business_guide
commit
Freshen up styling
Merge pull request #13 from alexabbott/alex

Freshen up styling
Add rails_12factor gem
Merge pull request #14 from alexabbott/alex

Add rails_12factor gem
Attempt to fix heroku issues
Merge pull request #15 from alexabbott/alex

Attempt to fix heroku issues
Remove relations
Merge pull request #16 from alexabbott/alex

Remove relations
Precompile assets for Heroku