jeffweiss/intern-test — pull request #26 by ajroetker (2013-05-28 21:05:34+00:00)
Title: 153 Add merge conflict

Prior to this commit things were ok. This commit creates conflict.