Changes of Tom
Merged with Mark's work and resolved conflicts
Removed .gitignore from the repository