changed names of html files
changed haml to erb
added feature tests
merged conflicts
Merge branch 'aaron' into luke
need lukes changes
merged and got postgres