merge
merge
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
added bills page, not fullly finished yet
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
Merge branch 'bills' of https://github.com/samzhao88/AgreeMates into develop