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

Conflicts:
	Laikos/Laikos/Input.cs
	Laikos/Laikos/Laikos.csproj.Debug.cachefile
	Laikos/Laikos/Objects/Decorations/Decoration.cs
	Laikos/Laikos/Objects/Decorations/DecorationManager.cs
	Laikos/Laikos/Player.cs
off
Merge branch 'master' of https://github.com/patrykos91/Laikos

Conflicts:
	Laikos/Laikos/Laikos.csproj.Debug.cachefile
buildings