working on seed file
test commit
test commit
Merge pull request #2 from mrwilsondj/master

test commit
merge fix
Merge branch 'Mannymin-master'
merge conflict fixed
Merge branch 'Mannymin-master'
merge commit
merge final fix
updated README.md
fixed README merge
Merge branch 'mrwilsondj-master'
fully installed Foundation. In working order
commit prior to running seed
working seed
Merge branch 'master' of github.com:cdbajorin/sportscast
added create user
added new user
added session