Delete workspace.xml
Delete vcs.xml
Delete modules.xml
Delete misc.xml
Delete encodings.xml
Delete can_haz_background.iml
Delete .rakeTasks
Delete .name
Delete scope_settings.xml
erge
Merge branch 'master' into background
Update grabber.rb
Update can_haz_poster.rb
change in itegration test
change in itegration test
merge