Added web-mode and update .emacs.d
Merge branch 'work', added web-mode.el and updated .emacs.d

Conflicts:
	.emacs.d/ac-comphist.dat
	.emacs.d/backups/!drive_c!Users!Steffen!.emacs~
	.emacs.d/backups/!drive_c!Users!Steffen!.ido.last~
	.emacs.d/backups/!drive_c!Users!Steffen!AppData!Roaming!.gnus~
	.emacs.d/backups/!drive_c!Users!Steffen!Documents!Coding!Playground!RandomNumbers.cpp~
	.emacs.d/backups/!drive_c!Users!Steffen!Documents!GitHub!Hangman!.git!COMMIT_EDITMSG~
	.emacs.d/backups/!drive_c!Users!Steffen!Documents!GitHub!dotfiles!.git!COMMIT_EDITMSG~
	.emacs.d/elpa/archives/gnu/archive-contents
	.emacs.d/elpa/archives/melpa/archive-contents
	.emacs.d/eshell/history
	.emacs.d/eshell/lastdir
	.emacs.d/tutorial/German.tut