sdasd
Merge branch 'master' of https://github.com/tfly2013/SMDProject.git

Conflicts:
	app/controllers/events_controller.rb
	app/models/event.rb
	app/models/ticket.rb
	app/views/events/show.html.erb