got startGame and getQuestion functions working
resolve conflict I hope
merging
fixed conflicts
finished fixing conflicts
fixed conflict
merge
merge
got definitions working