forgot password?
Merge branch 'master' of https://github.com/sanjurak/tourismo

Conflicts:
	FTP ClockTravel.txt
	tourismo/vendor/autoload.php
	tourismo/vendor/composer/autoload_real.php