correct for merge
Merge branch 'master' of https://github.com/NickJens/LED

Conflicts:
	app/controllers/engineers_controller.rb
	app/controllers/rentees_controller.rb
	config/routes.rb
API working