update
Fixed ListAdapter
fixing merges

Merge branch 'master' of https://github.com/JustinLovesCompsci/WhistleBlowerApp into Map

Conflicts:
	WhistleBlower/app/src/main/java/com/example/main/whistleblower/MainActivity.java