more modules
Merge pull request #22 from Swap-Meet/marissa

Marissa more module changes
merge
yupMerge branch 'marissa' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into g-details
linda
yupMerge branch 'dev' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into g-details
cleaned up
efgMerge branch 'g-details' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into g-details
cleaned up
Merge pull request #25 from Swap-Meet/g-details

G details