init
Merge branch 'master' of https://github.com/nabble/ajde

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/nabble/ajde into ajde
ajde changes from project