Second commit
Merge branch 'master' of https://github.com/GregThePaladin/gregthepaladin.github.com