nothing changed
nothing changed
resumews added, viewPersonalResume altered
viewResumePersonal altererd
Merge branch 'mandySprint4A'

Conflicts:
	build/web/WEB-INF/classes/edu/pitt/rest/userws.class
	build/web/WEB-INF/classes/edu/pitt/rest/viewEditUser.class
	build/web/WEB-INF/classes/edu/pitt/resumecore/User.class
	build/web/WEB-INF/classes/edu/pitt/resumecore/WorkExperience.class
	build/web/index.jsp
	nbproject/private/private.xml
	src/java/edu/pitt/rest/userws.java
	src/java/edu/pitt/rest/viewEditUser.java
	src/java/edu/pitt/resumecore/User.java
	web/index.jsp
recommit
viewPersonalResume reads resumews
commit before merge
Adjustments to viewPersonalResume
Changed Resume Layout and phone format
more additions to viewPersonalResume
commit before merging
commit after delete
Merge branch 'master' of https://github.com/dbabichenko/resume
merged master and mandySprint5