changed names of html files
changed haml to erb
added feature tests
added postgres gem
database.yaml
add and require sequel
merged conflicts
Merge branch 'aaron' into luke
need lukes changes
merged and got postgres