edit seed file to make rake db correctly
Merge branch 'functions'