edit createaccountuser method
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481Persistence/src/edu/ycp/cs481/srdesign/FakeDatabase.java
Merge branch 'master' of git@github.com:Thon9/CS481_SeniorDesignProject.git
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481Persistence/src/edu/ycp/cs481/srdesign/FakeDatabase.java
update
Merge branch 'master' of git@github.com:Thon9/CS481_SeniorDesignProject.git
nothing
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481Persistence/src/edu/ycp/cs481/srdesign/FakeDatabase.java
	CS481_Web/WebContent/main.jsp
nothing
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481_Controllers/.classpath
	CS481_Web/WebContent/main.jsp
	CS481_Web/edu/ycp/cs481/servlets/CreateAccount.java
error changes
nothing
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481_Web/WebContent/main.jsp
nothing
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git

Conflicts:
	CS481Persistence/src/edu/ycp/cs481/srdesign/FakeDatabase.java
	CS481_Web/WebContent/main.jsp
Merge branch 'master' of
git@github.com:Thon9/CS481_SeniorDesignProject.git