remove .svn
Merge branch 'master' into question1
adding object files