bla
Merge branch 'master' of https://github.com/rvnijnatten/2DGraphics

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.history/12/00134fdfc3a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/16/40008bd3a2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/1d/102c67eb8aa20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/1e/e0c458fd9ba200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/20/d03d616ca2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/22/70ffd5d89ba200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/24/f0d25e159ca200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/29/2096f56cc4a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/2f/d00a0b7da7a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/3e/e07879b79ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/3f/9070056ea5a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/42/80b8c3c88ba20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/42/d0c2ce4d9ca200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/4a/f045997c96a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/50/40024173a5a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/51/c0d842689ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/69/a096d7d3c3a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/79/50ebd0769ba20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/7d/306127a395a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/81/206ff17e88a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/86/405095f08aa20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/87/b073279188a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/8d/905e1727a6a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/8d/b0d54e4da2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/91/e016cbb39ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/9c/20c31dce95a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/a5/f0850d1f8ba20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/a9/90981345a2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/aa/00c9a58688a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/b/703764929ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/ca/60e1aa8b88a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/cf/501038af95a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/d/50a9a9e9a5a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/d0/f0b56ec38ca20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/de/50e1a61d9ca200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/fa/5095011ac3a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 2/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 3/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 3/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 4/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/12.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
Merge branch 'master' of https://github.com/rvnijnatten/2DGraphics

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.history/13/50071314c3a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/16/40008bd3a2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/1d/102c67eb8aa20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/1e/e0c458fd9ba200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/20/d03d616ca2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/22/70ffd5d89ba200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/24/f0d25e159ca200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/29/2096f56cc4a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/2f/d00a0b7da7a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/3e/e07879b79ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/3f/9070056ea5a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/42/80b8c3c88ba20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/42/d0c2ce4d9ca200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/4a/f045997c96a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/50/40024173a5a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/51/c0d842689ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/69/a096d7d3c3a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/79/50ebd0769ba20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/7d/306127a395a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/81/206ff17e88a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/86/405095f08aa20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/87/b073279188a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/8d/905e1727a6a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/8d/b0d54e4da2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/91/e016cbb39ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/9c/20c31dce95a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/a5/f0850d1f8ba20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/a9/90981345a2a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/aa/00c9a58688a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/b/703764929ea200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/ca/60e1aa8b88a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/cf/501038af95a20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/d/50a9a9e9a5a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/d0/f0b56ec38ca20012187a9dd939a95c22
	.metadata/.plugins/org.eclipse.core.resources/.history/de/50e1a61d9ca200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.history/fa/5095011ac3a200121a729a0c0215fe2f
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 2/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 3/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 3/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 4/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/12.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
update
meta
Merge branch 'master' of https://github.com/rvnijnatten/2DGraphics

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/16/40008bd3a2a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/1d/102c67eb8aa20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/1e/e0c458fd9ba200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/20/d03d616ca2a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/22/70ffd5d89ba200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/24/f0d25e159ca200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/2f/d00a0b7da7a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/3e/e07879b79ea200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/3f/9070056ea5a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/42/80b8c3c88ba20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/42/d0c2ce4d9ca200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/4a/f045997c96a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/50/40024173a5a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/51/c0d842689ea200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/79/50ebd0769ba20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/7d/306127a395a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/81/206ff17e88a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/86/405095f08aa20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/87/b073279188a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/8d/905e1727a6a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/8d/b0d54e4da2a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/91/e016cbb39ea200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/9c/20c31dce95a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/a5/f0850d1f8ba20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/a9/90981345a2a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/aa/00c9a58688a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/b/703764929ea200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/ca/60e1aa8b88a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/cf/501038af95a20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/d/50a9a9e9a5a200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/d0/f0b56ec38ca20012187a9dd939a95c22.orig
	.metadata/.plugins/org.eclipse.core.resources/.history/de/50e1a61d9ca200121a729a0c0215fe2f.orig
	.metadata/.plugins/org.eclipse.core.resources/.projects/Eindopdracht/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 2/.indexes/e4/history.index.orig
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 3/.indexes/e4/history.index.orig
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 3/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 4/.indexes/e4/history.index.orig
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 4/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Hoofdstuk 4/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/16.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/388983156.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml