Merge pull request #10 from undeadbeastking/master

Merge from conflict.
Agatha tries to create a conflict
Create a conflict
Fixing maybe