edited screen
added ignorefile
merged changes
added icons