Merge branch 'master' of https://github.com/jessecogollo/Parqueadero

Conflicts:
	ParqueaderoTest/ClienteTest.java
	ParqueaderoTest/ParqueaderoTest.java