Comitting some sins
Merge branch 'master' of https://github.com/JoshuaGWilliams/JoshTest