initial commit
merging
add styles