shema
Merge branch 'master' of https://github.com/derekscruggs/avenir

Conflicts:
	db/schema.rb