Merge pull request #161 from SUNY-Albany-CCI-INF362/master

Service and repayment plan fixed