Charge user based on previous weeks activity
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork

Conflicts:
	spec/controllers/activities_controller_spec.rb
	spec/factories/users.rb