Fixed merge conflict
Merge pull request #23 from emmagard/random_stuff

Fixed merge conflict