modified:   src/main/java/course/cs5300/project1a/dao/impl/SessionDAOImpl.java
	modified:   src/main/java/course/cs5300/project1a/pojo/SessionContent.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/GetLocalIPServiceImpl.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/LocalSessionTableManagerImpl.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/SessionCookieServiceImpl.java
	deleted:    target/m2e-wtp/web-resources/.gitignore
	deleted:    target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	deleted:    target/m2e-wtp/web-resources/META-INF/maven/course.cs5300/project1a/pom.xml
Merge branch 'master' of https://github.com/sdjksdafji/2Young2Simple

Conflicts:
	src/main/java/course/cs5300/project1a/service/implementation/LocalSessionTableManagerImpl.java

	modified:   src/main/java/course/cs5300/project1a/dao/impl/BootstrapViewDAOImpl.java
	modified:   src/main/java/course/cs5300/project1a/dao/impl/SessionDAOImpl.java
	modified:   src/main/java/course/cs5300/project1a/rpc/lib/service/impl/RPCBufferServiceImpl.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/LocalSessionTableManagerImpl.java
	modified:   src/main/java/course/cs5300/project1a/service/implementation/LocalSessionTableManagerImpl.java
Merge branch 'master' of https://github.com/sdjksdafji/2Young2Simple
Merge branch 'master' of https://github.com/sdjksdafji/2Young2Simple
timestamp fixed