Merge branch 'master' of https://github.com/Ace-programmer/oCloud

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