delete&combine
bug fix
spacing fix, gitignore
merge fix
show rest of apps below for now