Funka nu då!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library12/API/Controllers/AuthorsController.cs