Merge pull request #1 from jjordan9/master

Merge jeff's files
new cool method man
Merge pull request #1 from kenleezle/master

new method merge