merge
Merge branch 'master' of https://github.com/mdrobny/2DPlate

Conflicts:
	proj1.c