update
Merge branch 'master' of https://github.com/woutthielemans/cp3-eindopdracht-groep19

Conflicts:
	.idea/workspace.xml
	cp3-eindopdracht-groep19.iml
	out/production/cp3-eindopdracht-groep19/Main-android-descriptor.xml
	out/production/cp3-eindopdracht-groep19/Main.swf
	src/be/devine/cp3/converter/components/ConversionButton.as
	src/be/devine/cp3/converter/model/AppModel.as