some work on cup detection
Merge remote-tracking branch 'origin/master'
removed swp files