bug fix

tad var ekki haegt ad eyda myndum ur minar myndir
Merge branch 'master' of https://github.com/bjornlogi/Lokaverkefni

Conflicts:
	cinema.json