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
Refactor tests
rake task 'fetch_activities' created for scheduling on heroku
Merge branch 'master' into koala
changed to use fql_query for more controlled facebook querying.
The method create_statuses will no longer add a status that is already in the database