Bueno...
Merge branch 'master' of https://github.com/TrueniTo/symbolic

Conflicts:
	db/schema.rb