knowingly making a conflict
Merge branch 'master' of https://github.com/danvas/burnsbogcalculator

Conflicts:
	aprogram.c