[Cleanup]
Merge branch 'master' of http://github.com/billy1arm/wiki
[Cleanup]