Initial commit
fixing conflicts
raked scaffolds for User and Link