Laying the foundation
Merge branch 'master' of https://github.com/macwarlock/macwarlock.github.com