Accounting for difference between frame height and map view height
Resolved Image naming issue
Renamed feet
resolved merge conflict in .pbxproj
update .gitignore
Merge pull request #21 from gaylejj/master

Updated .gitignore, image naming issue