Merged the two stopwatch files

Still need to do graphics