Quitando espacios del index
Merge pull request #5 from CarlosTapiaOlguin/master

ignorar carpeta nbproject
Merge pull request #4 from JonathanEstay/master

Quitando espacios del index
prueba
prueba
Delete project.xml
Delete project.properties
Delete private.xml
Delete private.properties
Delete config.properties
Delete licenseheader.txt
Agregando las libs
Merge pull request #6 from JonathanEstay/master

Agregando las libs
vehiculo dao
Merge branch 'master' of http://github.com/IngenieriaWeb2013/SinAuto

Conflicts:
	nbproject/private/private.properties