Merge pull request #3 from ManuelCintron/master

lolololololol
Merge pull request #4 from ManuelCintron/master

++
Merge pull request #5 from ManuelCintron/master

-
Merge pull request #6 from ManuelCintron/master

hgsfd
sad
hola
jaja
afds
Merge remote-tracking branch 'origin/master'

Conflicts:
	NavLog Calculator/src/com/example/navlog/calculator/AirportModel.java
Merge pull request #3 from fssaez/master

HELP!