styling
merge conflict fix
modified db
Merge pull request #1 from TopherBlair/master

styling changes
a
Merge branch 'master' of github.com:kudoku/space_monkey into products