committing before repo cleanup
merge css conflict fixed
added logo