first commit
Merge branch 'master' of https://github.com/tamagodon/larmov

Conflicts:
	_.htaccess
	_.htpasswd
	app/routes.php
	app/views/layouts/master.blade.php
	app/views/project001/index.blade.php
	app/views/results.blade.php
	app/views/test.blade.php
	app/views/watch.blade.php
	public/hook.php
	public/js/mainscript.js
	public/js/post.js
Merge branch 'master' of https://github.com/tamagodon/larmov

Conflicts:
	app/views/layouts/master.blade.php
	app/views/project001/index.blade.php