modified
Merge branch 'master' of https://github.com/syafik/simple-accounting

Conflicts:
	app/models/ability.rb
	db/schema.rb