Test
Merge branch 'master' of https://github.com/mloks/CloudApp

Conflicts:
	app/client/src/main.js