merge conflict file test.
Merge branch 'develop' of https://github.com/bullback/ToyProject into test

Conflicts:
	controller/test3.js
Merge pull request #7 from raonism/test

Merge conflict file