removed merge file

Signed-off-by: Michel Wacker <git@starnut.com>
Merge branch 'master' of https://github.com/dbltnk/ouya-loom-jam