adding things that are awesome.
adding kde stoppage and startage
fixing .gitignore
resolving conflict