new idea
Merge branch 'master' of github.com:cangiuli/sigbovik

Conflicts:
	ideas