requiring specific roles in api
foundation styling
Merge branch 'master' of github.com:perryqh/burn_level

Conflicts:
	spec/lib/controller_authentication_spec.rb
	spec/models/user_spec.rb