Added gitignore, new version of Formations-diagram

Comments in .dia-file for later discussion.