Merge branch 'master' of github.com:robertlyc/ticketee

Conflicts:
	app/controllers/tickets_controller.rb
	app/models/ticket.rb
	app/views/tickets/_form.html.erb
	app/views/tickets/show.html.erb
	db/schema.rb
	spec/features/creating_tickets_spec.rb
Merge branch 'master' of github.com:robertlyc/ticketee