setting up first test
solve merge conflict
Merge branch 'master' of github.com:christophetd/hackathon
set up buggy test
Merge branch 'master' of github.com:christophetd/hackathon