commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	WindowsFormsApplication1/WindowsFormsApplication1.v12.suo
Merge branch 'master' of https://github.com/RobinP122/Calculatrice

Conflicts:
	WindowsFormsApplication1/WindowsFormsApplication1.v12.suo