jsicree/joe-on-tech — pull request #16 by jsicree (2013-10-24 15:46:30+00:00)
Title: Merge pull request #15 from jsicree/master

Pull request to sync dev with the master