Merge pull request #1 from kenleezle/master

new method merge
prob int x
Merge pull request #2 from jjordan9/master

Merge jeff's files