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

Conflicts:
	Laikos/Laikos/Game1.cs
	Laikos/Laikos/Objects/Object.cs