Merge branch 'master' of github.com:BattyBovine/solder_reflow

Conflicts:
	.gitignore
Merge branch 'master' of github.com:BattyBovine/solder_reflow