Merge pull request #1 from nabeelsmushtaq/second-branch

first_change_second_merged
Update first_change_master
Merge branch 'second-branch'
Merge branch 'second-branch'
mass
Merge branch 'master' of https://github.com/nabeelsmushtaq/pub
nab
Merge branch 'master' into second-branch

Conflicts:
	first_change_master