removing untracked files and adding .idea to .gitignore
Merge branch 'master' of https://github.com/dshuck/thymeleaf-groovy-helloworld into dev

Conflicts:
	.idea/.name
	.idea/modules.xml
	build.gradle
modify .gitconfig