fix
merge
jm
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
Merge branch 'master' of https://github.com/patrykos91/Laikos

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