ui
ui
Merge branch 'master' of
https://github.com/justinleewells/JPMCodeForGood.git

Conflicts:
	HandsOnApp/src/jpmc/team12/handson/MainActivity.java