Merge remote-tracking branch 'origin/Test' into Development
added time tester
added this to class
fixed error
Merge branch 'class'