Initial commit
Merge branch 'vanik' into vanikMergedWithGameMechanic
before merging