Merge pull request #1 from hellotj/christa

tellin it like it is
creating conflict
Merge branch 'master' into christa