Changed parameters
Added timing functions
Fixed merge conflicts
Slight performance increase from lookup table
gitignore for cpp stuff
Division into separate files