Makefile cleanup
Added license
Merge branch 'master' of https://github.com/pcercuei/o2xiv

Conflicts:
	Makefile