styles
Merge branch 'master' into em_dev
things
students' profile pages
Merge branch 'profiles' of https://github.com/lukru/codium into lukru-profiles

Conflicts:
	app/helpers/application_helper.rb
Merge pull request #53 from albertodotcom/master

Merge Lauren changes
Add users seed with our email adresses
Merge pull request #55 from albertodotcom/master

Add users seed with our email adresses
Fixed parameters in user model, added fontawesome gem, removed fontawesomecss sheet
Merge pull request #54 from MollyMoile/marcus

whitelisted image in user params
Fix users controller authorization
Merge branch 'samsam' of https://github.com/sammyjopeters/codium into sammyjopeters-samsam
delete binding.pry from users controller
Merge branch 'master' of https://github.com/epoch/codium

Conflicts:
	app/controllers/users_controller.rb
Merge pull request #57 from albertodotcom/master

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

Fix users routes