new test method was added
Merge branch 'master' into Kiura

Conflicts:
	controllers/test.js
	views/index.html