before work 23/08/13
Merge branch 'master' of github.com:Grapheme/conferum
add to bid
bid finish
Merge branch 'master' of github.com:Grapheme/conferum