merging branches
Merge branch 'gh-pages'
removed two images
fixed the database icon