added game model, type column included for sti
conflicts resolved, merged with master, game model created