making a conflict 2
Merge branch 'master' of https://github.com/netor27/VS2013Test.git