merge conflict file test.
i saved this file
Merge pull request #6 from iimplicit/develop

i saved this file
Merge branch 'develop' of https://github.com/bullback/ToyProject into test

Conflicts:
	controller/test3.js