test
test
ytest
test
Merge branch 'master' of https://github.com/tamagodon/larmov

Conflicts:
	Connections/_notes/dwsync.xml
	_.htaccess
	_.htpasswd
	app/_notes/dwsync.xml
	app/routes.php
	app/storage/_notes/dwsync.xml
	app/tests/_notes/dwsync.xml
	app/views/_notes/dwsync.xml
	app/views/ajax/_notes/dwsync.xml
	app/views/collection/_notes/dwsync.xml
	app/views/layouts/_notes/dwsync.xml
	app/views/layouts/master.blade.php
	app/views/project001/_notes/dwsync.xml
	app/views/project001/index.blade.php
	app/views/project001/js/_notes/dwsync.xml
	app/views/results.blade.php
	app/views/test.blade.php
	app/views/watch.blade.php
	bootstrap/_notes/dwsync.xml
	hidden/_notes/dwsync.xml
	hidden/emails/_notes/dwsync.xml
	hidden/emails/auth/_notes/dwsync.xml
	hidden/hello/_notes/dwsync.xml
	hidden/ouyou/_notes/dwsync.xml
	hidden/test/_notes/dwsync.xml
	hidden/touhyou/_notes/dwsync.xml
	hidden/views/projecttest/_notes/dwsync.xml
	hidden/views/routetest/_notes/dwsync.xml
	hidden/youtube/_notes/dwsync.xml
	laravel-develop/_notes/dwsync.xml
	public/_mmServerScripts/_notes/dwsync.xml
	public/_notes/dwsync.xml
	public/hook.php
	public/img/_notes/dwsync.xml
	public/js/AutoRuby/_notes/dwsync.xml
	public/js/_notes/dwsync.xml
	public/js/html5jp/graph/_notes/dwsync.xml
	public/js/mainscript.js
	public/js/post.js
	public/js/star-rating/_notes/dwsync.xml
	public/original/_notes/dwsync.xml
	public/packages/_notes/dwsync.xml
	public/tbs/css/_notes/dwsync.xml
	public/tbs/img/_notes/dwsync.xml
	public/tbs/js/_notes/dwsync.xml
	vendor/_notes/dwsync.xml
	vendor/composer/_notes/dwsync.xml
	vendor/vendor/laravel/framework/src/Illuminate/Cookie/_notes/dwsync.xml