styles
Merge branch 'master' into em_dev
things
homepage nav settings, homepage backgrounds chnaged, info for the stack, image resize, user profile edit page fixed.
merge conflict
Merge pull request #58 from emacca/em_dev

Emily and Pranav