f1015
Merge branch 'master' of https://github.com/zakilo/PAT

Conflicts:
	al/1015.c
	al/in.txt