Finishing up changes

Changed link to my github repo. Also, a confusing merge happened. I'm
new to github! Cut me some slack!