Merge pull request #1 from ikilledmypc/tim

Tim
test
Merge pull request #2 from ikilledmypc/Kevin

test
testcommit
Merge pull request #3 from ikilledmypc/jinv1

testcommit
Merge pull request #4 from ikilledmypc/master

daf