css homepage
css homepage
css homepage
Merge branch 'master' of github.com:121watts/the_pivot into issue9
getting code up to date with all other branches
closes issue#7
Merge pull request #26 from 121watts/issue#7

closes issue#7
Really remove database.yml from git
Fix database.yml issue???
fixes merge conflicts
Keep fixing untrack database.yml issue
fixes merge conflicts
fixes merge conflicts
Merge pull request #25 from 121watts/issue9

Issue9
saved to merge with master
Fixed merge conflicts