Implementing citations
Work in progress, BROKEN build pushed to share code
Merge remote-tracking branch 'upstream/software-testing' into software-testing

Conflicts:
	src/app/Cli.java
Merge pull request #16 from aphextinez/software-testing

portfolio functions for Citations + delete fix