Closed
Merge branch 'master' of https://github.com/trigun0x2/raffit

Conflicts:
	db/schema.rb