Godwin 1efe20fe42 Fixed merge conflicts

2014-07-18 20:35:15 -06:00

..

migrate

Fixed merge conflicts

2014-07-18 20:35:15 -06:00

schema.rb

Fixed merge conflicts

2014-07-18 20:35:15 -06:00

seeds.rb

first commit

2013-04-19 19:14:51 +02:00