oy dio mio
oy dio mio 2
Merge branch 'master' of https://github.com/rizotas/parking

Conflicts:
	js/app.js
merge