Done

I've made the final changes and this is the project state at handin
phase