Create project
Merge branch 'master' of github.com:Nopal/gradle-java-project

Conflicts:
	.gitignore