Cleaned up master branch, did .gitingore correctly
Merge branch 'master' of github.com:kevnshin/starfox_travelagency into merge_branch