gitignore test
Merge branch 'master' of https://github.com/menboy/ATD_Login

Conflicts:
	war/WEB-INF/built-jar.properties