updated town view
created shop view
create shop module
changed css and added inventory
fix merge conflict
created base view&layout for inventory