Removed initialiser from listing model
Updated schema
Added username to user model
Updated user model and rspec
removed merge conflict