Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into develop
add propoer Bootstrap to the homepage and change menu items
just transfer from mac to pc
Merge branch 'develop' of https://github.com/samzhao88/AgreeMates into develop
Merge branch 'homepage' of https://github.com/samzhao88/AgreeMates into develop