.gitignore is now working
Merge branch 'master' of github.com:cs0511/struts2