qi
commiting stuff
fixed bug
mergint timer
fixed collab
fixed collab bug2