Merge pull request #1 from jmwhicke/jmwhicke

Jmwhicke
Merge branch 'jmwhicke'

Updating master with jmwhicke files... hopefully works SHIT!
Merge pull request #2 from jmwhicke/master

Update files... hopefully.