added fps limiter and slightly changed how game is serialized
added map and fixed some game stuff
merge conflict