Progress towards making it build
Merge of Erica's changes
Adding the classpath to the gitignore