colors
delete keyword
fix merge conflict
Merging with master!
Merge branch 'master' into drag_drop
Merge pull request #28 from fox-squirrels-2013/drag_drop

Drag drop