Merge pull request #40 from Swap-Meet/offer

Offer
Merge pull request #41 from Swap-Meet/profile

profile
almost done with profile
yup:wq
Merge branch 'dev' into profile