Made gamemodel a singleton object
merging master to gamemodel
solved error
merge and solve merge conflict
merging master again