a
Merge branch 'master' of https://github.com/patrykos91/Laikos

Conflicts:
	Laikos/Laikos/Laikos.csproj.Debug.cachefile
Merge branch 'master' of https://github.com/patrykos91/Laikos
as