GUI and time mesurement added
Forgot to add
Merge conflicts fixed