Synchronisation

Synchronised everything and ammended the gitignore.