payments
Merge branch 'master' of https://github.com/sanjurak/tourismo

Conflicts:
	tourismo/app/views/createReservationPartial.blade.php
	tourismo/app/views/login.blade.php