Added complete field to submissions
Fixed merge conflicts in submission controller
Fixed seed merge conflict
WIP ticket booth view
Merge remote-tracking branch 'upstream/release-1' into release-1-ticket-booth

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/participants_controller.rb
	app/models/participant.rb
Add approve button for submissions
Add authentication to user & submission controller
Update gitignore
Merge pull request #17 from maebeale/release-1

merge conflicts
Merge remote-tracking branch 'upstream/release-1' into release-1-ticket-booth

Conflicts:
	app/models/participant.rb
	app/models/ticket.rb
Modify user_controller specs
Fix merge conflicts, association conflicts
Merge pull request #18 from dazm12/release-1

Updated submissions, added approve, modified associations
updated mailers
testing don't merge
updated submissions mailer
started basic slim template
testing push request
edited mailer
WIP booth views