Merge branch 'master' of https://github.com/beatCrystalgeysers/halcinema

Conflicts:
	index.html