merge conflict
Merge Conflict
Fixed bug in charges controller
Merge branch 'master' of https://github.com/kmazanec/adopt-a-coder into update_seed_file
Merge pull request #101 from kmazanec/update_seed_file

Update seed file