Fixed conflicts
merge/conflict
Merge pull request #25 from WhaleMonster/kevin

Kevin