typo
Add in new Angular.
Merge branch 'dev' into LindaDev
Add updated views.

Merge branch 'dev' into LindaDev
clean code
Most recent front-end updates
Merge branch 'dev' into LindaDev
update
copy over test
add in front end

Merge branch 'dev' into LindaDev
update json
add json

Merge branch 'dev' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into LindaDev
merge
yupMerge branch 'marissa' of https://github.com/Swap-Meet/Swap-Meet-Front-End-And-Server into g-details
Merge pull request #23 from Swap-Meet/LindaDev

Linda dev
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