Minor tweaks
merge conflicts resolved
fixed merge conflicts
New fixes
Merge branch 'master' into alex
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
Merge pull request #17 from alexabbott/alex

Precompile assets for Heroku
Attempt to fix precompiling error
Merge pull request #18 from alexabbott/alex

Attempt to fix precompiling error
Change background color
Merge pull request #19 from alexabbott/alex

Change background color
Precompile again