working on seed file
Merge branch 'master' into links
changed seed file, probably some other things i cannot remember
merge conflicts in gemfile lock
Merge branch 'master' into links
Merge pull request #57 from nealcpeters/links

Links