add book function if has available tickets, merge tickets for same event
merge tickets based on user id, show merged ticket details before index, display tickets filtered by current user id
make settings page edit user with avatar upload and display
committing files
Merge branch 'master' of http://github.com/maip/ticketlist-1

Conflicts:
	Gemfile
	app/views/events/show.html.erb
	app/views/layouts/application.html.erb