added delete and edit buttons to index
fixed indentation of haml form
Merge branch 'master' into question_views