TeamProject Do NOT merge into master. When you have finished on your branch. Come to ALEX and he can merge if it works!