Fixed error with .gitignore
Cleanup and measuring time

Split into two files and added class for measuring time.