A couple more bugs
A couple more bugs
Merge branch 'defect-add' of github.com:aphextinez/app into defect-add

Conflicts:
	src/app/Cli.java
Merge pull request #32 from aphextinez/defect-add

A couple more bugs
Merge branch 'defect-add' of https://github.com/jamesmiller5/app into defect-add