sync
added new icons
fixed merrge conflict
css changes
adding content to cul page
still content being added
fixed merge conflict