ah
Merge branch 'master' of https://github.com/zxjcarrot/EL

Conflicts:
	el_utility.h
ah