Added tracking of web.xml
Merge branch 'master' of https://github.com/jonathanklingberg/ETSN05

Conflicts:
	.gitignore