Up to date version
Up to date version
Merge pull request #4 from WiechersV/alex_branch

Alex branch
Merge branch 'master' of https://github.com/WiechersV/exo_help_ticket into djere_branch

Conflicts:
	app/controllers/application_controller.rb
	app/views/ticket/new.html.erb
	config/routes.rb