file added
Merge github.com:kkruups/junkdraw

Need to resolve local conflicts with remote repo