Fixed parameters in user model, added fontawesome gem, removed fontawesomecss sheet
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