merge conflict
Merge Conflict
Merge pull request #100 from kmazanec/testing_branch_20

Testing branch 20
Delete application_form_spec.js
Delete jasmine_helper.rb
Delete jasmine.yml
Delete SpecHelper.js
Delete .gitkeep
no jasmine
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
Merge branch 'master' of https://github.com/kmazanec/adopt-a-coder into testing_branch_20