made a change to testing
added more changes in master branch
Merge branch 'testing'

Conflicts:
	.vimrc