First pass at file changes
Ignore the right files
Don't commit Gemfile.lock
Spec refactor
Resolve conflicts
Better specs
Add summary attribute