Merge branch 'master' of https://github.com/laoraid/AJNA

Conflicts:
	.gitignore