Blue world
Merge branch 'feature-red'

Conflicts:
	src/main/java/com/ambientideas/App.java

I fixed this by making it an amalgamation of the two logic bits (purple)
Roll us back
Merge branch 'master' of https://github.com/githubteacher/example-maven
Hotfix bump to 3.8.3
Project updates testing to 4.0
Solved the conflict in JUnit versions
Hot fix to project name
Merge branch 'master' into feature-red

Conflicts:
	pom.xml