update gemfile
resolve conflicts
resolve conflicts
database
update gemfile
establish models
import file functionality
display runs on front page; handle duplicates; fix import bug
index pages
placeholders for create/update/delete for models