fixed some more errors
adding *.o to gitignore
Merge branch 'master' of github.com:Criten/tis