review based on code from morning of Oct 2
.
resolving merge conflict
resolving merge conflict
Merge pull request #57 from tarynsauer/review-20131002-morning

review based on code from morning of Oct 2