scores non-cumulative, checks for straight lines
resolving conflicts
resolving more conflicts
fixing bugs
Merge pull request #29 from Eye-Static/zach

Zach