Added new ticket type based on scaffolding, test in separate commit when fixed
merged conflict
completed most specs for ticket
merged master
Merge pull request #4 from smidig/tickets

Tickets
Updated spec_helper.rb