Projec 3
Merge branch 'master' of https://github.com/eduardoagr/VF08

Conflicts:

Gomez_Eduardo_project2/build/iphone/build/Debug-iphonesimulator/Gomez_Ed
uardo_project2.app.dSYM/Contents/Resources/DWARF/Gomez_Eduardo_project2

Gomez_Eduardo_project2/build/iphone/build/Debug-iphonesimulator/Gomez_Ed
uardo_project2.app/Gomez_Eduardo_project2

Gomez_Eduardo_project2/build/iphone/build/Gomez_Eduardo_project2.build/D
ebug-iphonesimulator/Gomez_Eduardo_project2-universal.build/Gomez_Eduard
o_project2-universal.dep

Gomez_Eduardo_project2/build/iphone/build/Gomez_Eduardo_project2.build/D
ebug-iphonesimulator/Gomez_Eduardo_project2-universal.build/build-state.
dat