Merge pull request #1 from wennylover/master

add test pull request file
modified by makeiteasy.
Merge branch 'master' of https://github.com/wennylover/myrailsapp into wenny-master

Conflicts:
	testpull.txt
Merge pull request #1 from MakeItEasy/master

sync from makeiteasy