Merge branch 'software-testing' of https://github.com/jamesmiller5/app into software-testing
added more integration tests for registration
Merge branch 'software-testing' of https://github.com/jamesmiller5/app into software-testing
Merge pull request #15 from abmack/software-testing

Adding integration tests for registration
Work in progress, BROKEN build pushed to share code
Merge remote-tracking branch 'upstream/software-testing' into software-testing

Conflicts:
	src/app/Cli.java