merge
shit
Merge branch 'master' of https://github.com/jeremykainostraining/bestproject

Conflicts:
	GoodByeProject/WebContent/WEB-INF/bye-dispatcher-servlet.xml
	GoodByeProject/home/and/workspace/GoodbyeProject/target/m2e-wtp/web-resources/META-INF/maven/GoodbyeProject/GoodbyeProject/pom.properties
	GoodByeProject/pom.xml
	GoodByeProject/src/bye/data/IEmployeeMapper.java
	GoodByeProject/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	GoodByeProject/target/m2e-wtp/web-resources/META-INF/maven/GoodbyeProject/GoodbyeProject/pom.properties