Add git alias to sync upstream repo
Highlight C++ class scope
Merge branch 'master' of github.com:zachwhaley/dotfiles

Conflicts:
	gitconfig.symlink