Test Merge branch 'master' of https://github.com/ost500/cloudM into kim
Test
Merge branch 'master' of https://github.com/ost500/cloudM into kim

# Conflicts:
#	public/css/main.css
#	vendor/laravel/framework/src/Illuminate/Foundation/Auth/RegistersUsers.php

ost500/cloudM,ost500/cloudM,jxamen/cloudM-1,jxamen/cloudM-1,jxamen/cloudm,ost500/cloudM,jxamen/cloudM-1,ost500/cloudM,jxamen/cloudm,jxamen/cloudm,jxamen/cloudM-1