Merge branch 'master' of http://github.com/Rothyu/Vimrc_configs

Conflicts:
	.gitignore

test the commit --amend
add LICENSE and README.md
Merge branch 'master' of http://github.com/Rothyu/Vimrc_configs
Merge branch 'master' of http://github.com/Rothyu/Vimrc_configs
THis is a merge after fetch the files from remote repository

Conflicts:
	README.md
This is to check the change both happened in the local and the remote
Merge branch 'master' of http://github.com/Rothyu/Vimrc_configs
The file is pulled from the remote repository

Conflicts:
	README.md