I don't think I changed anything, but I need to commit to pull. Haha sorry, still getting the hang of GitHub.
Merge branch 'master' of https://github.com/LGrocket/FindAFlock
aaa
Merge branch 'master' of https://github.com/LGrocket/FindAFlock

Conflicts:
	view/.DS_Store
	view/dashboard.ejs
	view/flight.ejs
Merge branch 'master' of https://github.com/LGrocket/FindAFlock
i don't understand git
Merge branch 'master' of https://github.com/LGrocket/FindAFlock

Conflicts:
	app.js
added src for geolocation in head