pushing semi-new
temp
Merge branch 'master' of https://github.com/chrisn21/team6

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.team6/app/pom.properties