modified by wenny 1.
test pull request 2.
added by wenny for test pull request.
modified by wenny 1, 2.
Merge branch 'master' of https://github.com/wennylover/myrailsapp into wenny-master

Conflicts:
	testpull.txt