add gitignore
add xmonad.hs file
add my vimrc
resolve conflicts