another magnific test
Merge branch 'master' of https://github.com/RyanGough/ryangough.github.com