inint
added bugs
tmp
Added game states
merged with origin master