web-app files
Merge branch 'master' of https://github.com/alelifaithCabahug/gradAdvising

Conflicts:
	target/classes/resources.class