completed editing html files
fixed blog
finished documentation
merge changes