Initial commit
merge fix
adding views