DarthBurrit0/nomadaxe.com — pull request #37 by emkay (2013-04-27 20:52:12+00:00)
Title: Merging in @jxson haiku change

Merge + conflict fix.