set
Merge branch 'master' of
https://github.com/NealYang/AccountingSystem.git

Conflicts:
	WebRoot/WEB-INF/classes/.gitignore