Enric does not know how to user git
Merge branch 'master' of https://github.com/enricenrich/ParkingPlace

Conflicts:
	Parking Place/TodayViewController.swift
	ParkingPlace/ViewController.swift