changes to window and workspace
completed merge
font-awesome now works
added the folder needed