Merge branch 'master' of github.com:pengpengxp/linux-ubuntu14.04-config

Conflicts:
	.gitignore
Solved
加入了一些目录进来