.
Merge branch 'master' of https://github.com/ghidalgo3/CS2340-such-android

Conflicts:

FinancialPlanningApp/FinancialPlanning/src/main/java/edu/gatech/CS2340/s
uchwow/Activities/DisplayReportActivity.java

FinancialPlanningApp/FinancialPlanning/src/main/java/edu/gatech/CS2340/s
uchwow/Activities/GenerateReportActivity.java