firstcommit
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
fixed README merge
Merge branch 'mrwilsondj-master'
commit prior to running seed
working seed
Merge branch 'master' of github.com:cdbajorin/sportscast
added create user
added new user
added session
test
merger foundation, user log-in