updated town view
created shop view
changed css and added inventory
fix merge conflict