Final moment commit
Merge branch 'gamejam' of https://github.com/vankovilija/everyoneisafriend into gamejam