old stuff
Merge branch 'master' of https://github.com/Willifme/Sol

Conflicts:
	lib/sol/nodes.rb
	lib/sol/parser.treetop
Stuff