Merge pull request #49 from Swap-Meet/marissa

mixin, module, global changes
profile page and styling changes