.classpath to gitignore
Merge branch 'adrian'
inventory complete and stuff