changed subtract to divide, added i to add
Merge branch 'master' of https://github.com/ikitha/conflict_test

Conflicts:
	methods.rb
Merge branch 'master' of https://github.com/ikitha/conflict_test

Conflicts:
	methods.rb
Merge pull request #5 from robfitz82/master

fsjvhfdjghkfjg;fkj