Merge pull request #1 from agreenturtle/James

James
add another line
change some stuff