Got main fragment completely working with the points and countdown persistant
got all of the main fragment working with points and countdown persisting and fixed a merge conflict