updates
merge conflict resolved
clean up
converter for file types
pdf styling, download to png or jpeg, logout working