update with work
Add support for c++ header file completion
Fullscreen on startup
Fixed merge conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	dot-spacemacs