Merge branch 'master' of https://github.com/gemathon-warriors/spicon

Conflicts:
	pkg/spicon-0.0.2.gem
Merge branch 'master' of https://github.com/gemathon-warriors/spicon