Passes the spec, but I can still see some potential issues#17

Open

gwadej wants to merge 2 commits intomasterfrom

Commits on Oct 1, 2015

Passes the spec, but I can still see some potential issues
G. Wade Johnson
committed

Commits on Oct 6, 2015

Simplify logic
G. Wade Johnson
committed