added project file to gitignore
lösung "SuperDuper"
Merge branch 'master' of github.com:vodickae/techtalkdemo

Conflicts:
	src/main/webapp/main.jsp