Adding cscope.out to gitignore
Adding cscope.out
Adding stat resetting
Adding cscope.out and lib/
Modifying .gitignore
Fixing merge conflicts