styles
Merge branch 'master' into em_dev
things
Merge pull request #57 from albertodotcom/master

Merge Sam changes
homepage nav settings, homepage backgrounds chnaged, info for the stack, image resize, user profile edit page fixed.
merge conflict
Merge pull request #59 from albertodotcom/master

Fix users routes
Merge pull request #58 from emacca/em_dev

Emily and Pranav