adding font
rebundled
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
updated js and map
updated button functionality
updated javascript
commit conflict resolution
updated map size stylesheets
updating flight_path js
updated newark flight data
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
corrected typos
Merge branch 'master' of https://github.com/whyu/wdi_project_2 into development
pulled from master and fixed conflicts
adding javascripts