a
a
Merge branch 'master' of https://github.com/hchan/comp2613.git

Conflicts:
	src/applicationContext.xml