Initial commit
initial setup
removed cached file
fixed merge issues