n/a
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481_Web/WebContent/WEB-INF/lib/CS481.jar
Merge branch 'master' of git@github.com:Thon9/CS481_SeniorDesignProject.git
n/a
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481Persistence/src/edu/ycp/cs481/srdesign/SQLDatabase.java
	CS481_Web/WebContent/WEB-INF/lib/CS481.jar
	CS481_Web/edu/ycp/cs481/servlets/EditPhoto.java