date ist nun string
Merge branch 'master' of /Users/rwinzing/Development/Hacking Days/2013 with conflicts.
Merge remote-tracking branch 'origin/master'