2U: project settings.

Conflicts:

	.bash_profile
	.bashrc
	.vim/vundle.vim
	.vimrc